repairmanual

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

@@ -0,0 +1,85 @@
+package com.zglc.kg.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.zglc.kg.base.Result;
+import com.zglc.kg.entity.DeleteEntity;
+import com.zglc.kg.entity.FaultEntity;
+import com.zglc.kg.service.FaultService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = "故障管理接口")
+@RequestMapping("api/fault")
+@CrossOrigin(allowCredentials = "true")
+@RestController
+
+public class FaultController {
+    @Resource
+    private final FaultService faultService;
+    @Autowired(required = false)
+    public FaultController(FaultService faultService){
+        this.faultService = faultService;
+    }
+
+    @ApiOperation("分页列出所有故障信息")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("listpage")
+    public Result<PageInfo<FaultEntity>> listpage(Integer page, Integer size) {
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>(faultService.listAll()));
+    }
+
+    @ApiOperation("列出所有故障")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("listAll")
+    public Result<List<FaultEntity>> listAll() {
+        return Result.success(faultService.listAll());
+    }
+
+    @ApiOperation("按故障ID查找")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("get")
+    public  Result<FaultEntity> get(@RequestParam Integer id){return  Result.success(faultService.getFault(id));}
+
+    @ApiOperation("按故障名称查询")
+    @GetMapping("getByName")
+    public Result<List<FaultEntity>> findByName(@RequestParam("name") String name){
+        return faultService.findByName(name);
+    }
+
+    @ApiOperation("增添故障")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @PostMapping("add")
+    public Result<String> add(@RequestBody FaultEntity data){return  faultService.add(data);}
+
+    @ApiOperation("删除故障")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @PostMapping("delete")
+    public Result<String> delete(@RequestBody DeleteEntity deleteEntity){return  faultService.delete(deleteEntity.getIds());}
+
+    @ApiOperation("修改故障")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @PostMapping("edit")
+    public Result<String> edit( @RequestBody FaultEntity data){return  faultService.edit(data);}
+
+}

src/main/java/com/zglc/kg/controller/FaultDefectController.java

@@ -1,75 +0,0 @@
-package com.zglc.kg.controller;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.zglc.kg.base.Result;
-import com.zglc.kg.entity.DeleteEntity;
-import com.zglc.kg.entity.FaultDefect;
-import com.zglc.kg.service.FaultDefectService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Api(tags = "故障缺陷接口")
-@RequestMapping("api/faultDefect")
-@CrossOrigin(allowCredentials = "true")
-@RestController
-
-public class FaultDefectController {
-
-    @Resource
-    private FaultDefectService faultDefectService;
-
-    public FaultDefectController(FaultDefectService faultDefectService)
-    {
-        this.faultDefectService = faultDefectService;
-    }
-
-    @ApiOperation("分页列出所有故障缺陷")
-    @ApiResponses({
-            @ApiResponse(code = 0, message = "成功")
-    })
-    @GetMapping("listpage")
-    public Result<PageInfo<FaultDefect>> listpage(Integer page, Integer size) {
-        PageHelper.startPage(page, size, "id desc");
-        return Result.success(new PageInfo<>(faultDefectService.listAll()));
-    }
-
-    @ApiOperation("列出所有故障缺陷")
-    @ApiResponses({
-            @ApiResponse(code = 0, message = "成功")
-    })
-    @GetMapping("listAll")
-    public Result<List<FaultDefect>> listAll() {
-        return Result.success((faultDefectService.listAll()));
-    }
-
-    @ApiOperation("增添故障缺陷")
-    @ApiResponses({
-            @ApiResponse(code = 0, message = "成功")
-    })
-    @PostMapping("add")
-    public Result<String> add( @RequestBody FaultDefect data){return  Result.success(faultDefectService.add(data));}
-
-
-    @ApiOperation("修改故障缺陷")
-    @ApiResponses({
-            @ApiResponse(code = 0, message = "成功")
-    })
-    @PostMapping("edit")
-    public Result<String> edit( @RequestBody FaultDefect data){return  Result.success(faultDefectService.edit(data));}
-
-    @ApiOperation("删除故障缺陷")
-    @ApiResponses({
-            @ApiResponse(code = 0, message = "成功")
-    })
-    @PostMapping("delete")
-    public Result<String> delete( @RequestBody DeleteEntity data){
-        return Result.success(faultDefectService.delete(data.getIds()));
-    }
-}

src/main/java/com/zglc/kg/controller/RepairManualController.java

@@ -9,8 +9,10 @@ import java.util.List;
 
 import com.zglc.kg.entity.*;
 import com.zglc.kg.service.RepairManualService;
+import com.zglc.kg.utils.DocToPdf;
 import com.zglc.kg.utils.FileTool;
 import com.zglc.kg.utils.FileTypeUtil;
+import com.zglc.kg.utils.Ppt2ToPdf;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -18,10 +20,11 @@ import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import com.zglc.kg.utils.FileTypeUtil.Type;
 
 import javax.servlet.http.HttpServletRequest;
 
-@Api(tags = "故障案例管理")
+@Api(tags = "故障维修手册管理")
 @RequestMapping("api/repairManual")
 @CrossOrigin(allowCredentials = "true")
 @RestController
@@ -30,7 +33,7 @@ public class RepairManualController {
     @Autowired
     private RepairManualService repairManualService;
 
-    @ApiOperation("分页列出所有案例")
+    @ApiOperation("分页列出所有维修手册")
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })
@@ -40,7 +43,7 @@ public class RepairManualController {
         return Result.success(new PageInfo<>(repairManualService.getAllRecord()));
     }
 
-    @ApiOperation("按机型分页列出所有案例")
+    @ApiOperation("按机型分页列出所有维修手册")
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })
@@ -50,7 +53,7 @@ public class RepairManualController {
         return Result.success(new PageInfo<>(repairManualService.listByAircraft(aircraftName)));
     }
 
-    @ApiOperation("按案例名称查询")
+    @ApiOperation("按维修手册名称查询")
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })
@@ -59,14 +62,14 @@ public class RepairManualController {
         return repairManualService.findByName(name);
     }
 
-    @ApiOperation("增添案例")
+    @ApiOperation("增添维修手册")
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })
     @PostMapping("add")
     public Result<String> add(@RequestBody RepairManualEntity data){return  repairManualService.add(data);}
 
-    @ApiOperation("删除案例")
+    @ApiOperation("删除维修手册")
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")
     })
@@ -74,6 +77,19 @@ public class RepairManualController {
     public Result<String> delete(@RequestBody DeleteEntity deleteEntity){
         return  repairManualService.delete(deleteEntity.getIds());}
 
+    @ApiOperation("修改维修手册")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @PostMapping("edit")
+    public Result<String> edit( @RequestBody RepairManualEntity data){return  repairManualService.edit(data);}
+
+    @ApiOperation("按维修手册ID查找")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("get")
+    public  Result<RepairManualEntity> get(@RequestParam Integer id){return  Result.success(repairManualService.getManual(id));}
 
 
     @ApiOperation("导入图片")
@@ -84,7 +100,7 @@ public class RepairManualController {
     public Result<Object> importFile(HttpServletRequest request, @RequestParam("file")MultipartFile file){
         Date date = new Date();
         String sourcePath1;
-        sourcePath1 = "d:\\source";
+        sourcePath1 = "d:\\sourcekg";
         String extName = ""; // 扩展名格式：
         extName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
         FileTypeUtil.Type fileType = FileTypeUtil.getFileType(file.getOriginalFilename());
@@ -96,7 +112,40 @@ public class RepairManualController {
         else {
             return Result.result(false, "图片格式错误", null);
         }
+    }
+
+    @ApiOperation("导入手册")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @PostMapping("import")
+    public Result<Object> importManual(HttpServletRequest request, @RequestParam("file")MultipartFile file){
+        Date date = new Date();
+        String sourcePath1;
+
+        sourcePath1 = "d:\\sourcekg";
+        String extName = ""; // 扩展名格式：
+        extName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+        String filePath = FileTool.fileUp(file, sourcePath1, date.getTime() + extName);
+
+        Type fileType = FileTypeUtil.getFileType(file.getOriginalFilename());
+        if (fileType == Type.DOC || fileType == Type.DOCX ||  fileType == Type.RTF ) {
+            DocToPdf.convertDoc2Pdf(filePath, sourcePath1);
+        }
+        else if (fileType == Type.PPT || fileType == Type.PPTX) {
+            Ppt2ToPdf.convertPpt2Pdf(filePath, sourcePath1);
+        }
+        filePath = filePath.replaceAll( "d:","");
+        return Result.success(filePath);
+    }
 
+    @ApiOperation("浏览手册")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("browse")
+    public Result<String> browse(@RequestParam String filepath){
+        return repairManualService.browse(filepath);
     }
 
 

src/main/java/com/zglc/kg/dao/FaultDao.java

@@ -0,0 +1,16 @@
+package com.zglc.kg.dao;
+
+import com.zglc.kg.entity.FaultEntity;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface FaultDao extends Mapper<FaultEntity> {
+
+    List<FaultEntity> listAll();
+
+    List<FaultEntity> findByName(@Param("name") String name);
+}

src/main/java/com/zglc/kg/dao/FaultDefectDao.java

@@ -1,10 +0,0 @@
-package com.zglc.kg.dao;
-
-import com.zglc.kg.entity.FaultDefect;
-import tk.mybatis.mapper.common.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface FaultDefectDao extends Mapper<FaultDefect> {
-
-}

src/main/java/com/zglc/kg/entity/FaultDefect.java

@@ -1,25 +0,0 @@
-package com.zglc.kg.entity;
-
-import lombok.Data;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Data
-@Table(name = "t_faultdefect")
-public class FaultDefect implements Serializable {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Integer id;
-
-    @Column(name = "fault_defect")
-    private String faultDefect;
-
-    @Column(name = "describes")
-    private String describes;
-
-    @Column(name = "remarks")
-    private String remarks;
-}

src/main/java/com/zglc/kg/entity/FaultDetectEntity.java → src/main/java/com/zglc/kg/entity/FaultEntity.java

@@ -6,8 +6,8 @@ import javax.persistence.*;
 
 
 @Data
-@Table(name = "t_faultdetect")
-public class FaultDetectEntity {
+@Table(name = "t_fault")
+public class FaultEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -18,22 +18,12 @@ public class FaultDetectEntity {
     @Column(name = "id")
     private Integer id;
 
-    /**
-     * 缺陷名称
-     */
-    @Column(name = "fault_detect")
-    private String faultDetect;
+    @Column(name = "fault_name")
+    private String fault_name;
 
-
-    /**
-     * 描述
-     */
     @Column(name = "describes")
     private String describes;
 
-    /**
-     * 备注
-     */
     @Column(name = "remarks")
     private String remarks;
 

src/main/java/com/zglc/kg/service/FaultDefectService.java

@@ -1,57 +0,0 @@
-package com.zglc.kg.service;
-
-import com.zglc.kg.dao.FaultDefectDao;
-import com.zglc.kg.entity.FaultDefect;
-import org.springframework.stereotype.Service;
-
-import java.util.Iterator;
-import java.util.List;
-
-@Service
-public class FaultDefectService {
-
-    FaultDefectDao faultDefectDao;
-
-    public FaultDefectService(FaultDefectDao faultDefectDao)
-    {
-        this.faultDefectDao = faultDefectDao;
-    }
-
-    public List<FaultDefect> listAll(){return faultDefectDao.selectAll();}
-
-    public String add(FaultDefect faultDefect){
-
-        if (faultDefect.getFaultDefect().isEmpty())
-            return "故障缺陷名不能为空!";
-        int n = faultDefectDao.insert(faultDefect);
-        if (n >0)
-            return "添加成功!";
-        else
-            return "添加失败";
-    }
-    public String edit(FaultDefect faultDefect){
-        if (faultDefect.getId() <= 0)
-            return "故障缺陷不存在!";
-        int n = faultDefectDao.updateByPrimaryKeySelective(faultDefect);
-        if (n >0)
-            return "添加成功!";
-        else
-            return "添加失败";
-    }
-
-    public String delete(List<Integer> ids)
-    {
-        String msg = "";
-        Iterator iter = ids.iterator();
-        while (iter.hasNext()) {
-            Integer id = (Integer) iter.next();
-            int index = faultDefectDao.deleteByPrimaryKey(id);
-            if (index == 0) {
-                msg += "删除失败!" + id + ";";
-            } else {
-                msg += "删除成功!" + id + ";";
-            }
-        }
-        return msg;
-    }
-}

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

@@ -0,0 +1,87 @@
+package com.zglc.kg.service;
+
+import com.zglc.kg.base.Result;
+import com.zglc.kg.dao.FaultDao;
+import org.springframework.stereotype.Service;
+import com.zglc.kg.entity.FaultEntity;
+import java.util.Iterator;
+import java.util.List;
+
+@Service
+public class FaultService {
+
+    private FaultDao faultDao;
+
+    public FaultService(FaultDao faultDao) {
+        this.faultDao = faultDao;
+    }
+
+    public List<FaultEntity> listAll() {
+        return faultDao.listAll();
+    }
+
+    public Result<String> add(FaultEntity data) {
+        data.setId(null);
+        boolean flag = true;
+        String msg = "";
+        int index = faultDao.insertSelective(data);
+        if (index == 0) {
+            flag = false;
+            msg = "添加故障信息失败!";
+        } else {
+            msg = "添加故障信息成功!";
+        }
+
+        return Result.result(flag, msg, msg);
+    }
+
+    public Result<String> delete(List<Integer> ids) {
+        boolean flag = true;
+        String msg = "";
+        Iterator iter = ids.iterator();
+        while(iter.hasNext()) {
+            Integer id = (Integer)iter.next();
+            int index = faultDao.deleteByPrimaryKey(id);
+            if (index == 0) {
+                flag = false;
+                msg += "故障删除失败!" + id + ";";
+            } else {
+                msg += "故障删除成功!" + id + ";";
+            }
+        }
+        return Result.result(flag, msg, msg);
+    }
+
+    public Result<String> edit(FaultEntity data) {
+        boolean flag = true;
+        String msg = "";
+        FaultEntity tmpData = faultDao.selectByPrimaryKey(data.getId());
+        if (tmpData != null) {
+            int index = faultDao.updateByPrimaryKeySelective(data);
+            if (index == 0) {
+                flag = false;
+                msg = "故障信息修改失败";
+            } else {
+                msg = "故障信息修改成功";
+            }
+        } else {
+            flag = false;
+            msg = "故障信息不存在!";
+        }
+        return Result.result(flag, msg, msg);
+    }
+
+    public Result<List<FaultEntity>> findByName(String name){
+        if (name == null ||"".equals(name)){
+            return Result.result(false, "名称不能为空" ,null);
+        }
+        List<FaultEntity> list = faultDao.findByName("%" + name + "%");
+        return Result.success(list);
+    }
+
+    public FaultEntity getFault(Integer id) {
+        return faultDao.selectByPrimaryKey(id);
+    }
+
+
+}

src/main/java/com/zglc/kg/service/RepairManualService.java

@@ -3,9 +3,11 @@ package com.zglc.kg.service;
 import com.zglc.kg.base.Result;
 import com.zglc.kg.dao.RepairManualDao;
 import com.zglc.kg.entity.*;
+import com.zglc.kg.utils.FileTypeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
+import com.zglc.kg.utils.FileTypeUtil.Type;
 
 import java.util.Iterator;
 import java.util.List;
@@ -92,26 +94,26 @@ public class RepairManualService {
         return Result.success(list);
     }
 
-    public Result<List<RepairManualEntity>> refindByName(String name1,String name2){
-        if (name1==null || "".equals(name1)){
-            return Result.result(false, "名称不能为空", null);
-        }
-        List<RepairManualEntity> list = repairManualDao.refindByName("%" + name1 + "%","%" + name2 + "%");
-        return Result.success(list);
-    }
+//    public Result<List<RepairManualEntity>> refindByName(String name1,String name2){
+//        if (name1==null || "".equals(name1)){
+//            return Result.result(false, "名称不能为空", null);
+//        }
+//        List<RepairManualEntity> list = repairManualDao.refindByName("%" + name1 + "%","%" + name2 + "%");
+//        return Result.success(list);
+//    }
 
 
-    public static final String SEARCHTYPE[] = {"aircraft","manual_system","major"};
-    public void setLogicString(int nType ,Example.Criteria criteria,int nKey,String v)
-    {
-        switch (nType){
-            case 0:criteria.andLike(SEARCHTYPE[nKey],v);break;
-            case 1:criteria.orLike(SEARCHTYPE[nKey],v);break;
-            case 2:criteria.andNotLike(SEARCHTYPE[nKey],v);break;
-            default:
-                break;
-        }
-    }
+//    public static final String SEARCHTYPE[] = {"aircraft","manual_system","major"};
+//    public void setLogicString(int nType ,Example.Criteria criteria,int nKey,String v)
+//    {
+//        switch (nType){
+//            case 0:criteria.andLike(SEARCHTYPE[nKey],v);break;
+//            case 1:criteria.orLike(SEARCHTYPE[nKey],v);break;
+//            case 2:criteria.andNotLike(SEARCHTYPE[nKey],v);break;
+//            default:
+//                break;
+//        }
+//    }
 
 
     public Result<List<RepairManualEntity>> findByHmc(String name) {
@@ -145,4 +147,26 @@ public class RepairManualService {
         List<RepairManualEntity> list = repairManualDao.findByGmp("%" + name + "%");
         return Result.success(list);
     }
+
+
+    public Result<String> browse(String filepath){
+        Type fileType = FileTypeUtil.getFileType(filepath);
+        if (fileType == Type.DOC ) {
+            filepath = filepath.replaceAll( "doc","pdf");
+        }
+        if (fileType == Type.DOCX ) {
+            filepath = filepath.replaceAll( "docx","pdf");
+        }
+        if (fileType == Type.PPT ) {
+            filepath = filepath.replaceAll( "ppt","pdf");
+        }
+        if (fileType == Type.PPTX ) {
+            filepath = filepath.replaceAll( "pptx","pdf");
+        }
+        return Result.success(filepath);
+    }
+
+    public RepairManualEntity getManual(Integer id) {
+        return repairManualDao.selectByPrimaryKey(id);
+    }
 }

src/main/resources/mapping/FaultDao.xml

@@ -0,0 +1,25 @@
+<?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.zglc.kg.dao.FaultDao">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.zglc.kg.entity.FaultEntity" id="faultMap">
+        <result property="id" column="id"/>
+        <result property="fault_name" column="fault_name"/>
+        <result property="describes" column="describes"/>
+        <result property="remarks" column="remarks"/>
+    </resultMap>
+
+    <select id="listAll" resultMap="faultMap">
+        select *
+        from t_fault
+        where id > 0
+    </select>
+
+    <select id="findByName" parameterType="String" resultMap="faultMap">
+        select  * from t_fault
+        where fault_name like #{name}
+    </select>
+
+</mapper>

src/main/resources/mapping/FaultDetectDao.xml

@@ -1,39 +0,0 @@
-<?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.zglc.kg.dao.FaultDetectDao">
-
-    <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.zglc.kg.entity.FaultDetectEntity" id="detectMap">
-        <result property="id" column="id"/>
-        <result property="faultDetect" column="fault_detect"/>
-        <result property="describes" column="describes"/>
-        <result property="remarks" column="remarks"/>
-    </resultMap>
-
-    <select id="listAll" resultMap="detectMap">
-        select id,fault_detect,describes,remarks
-        from t_faultdetect
-        where id > 0
-    </select>
-
-    <select id="getCount" resultType="java.lang.Integer">
-        select count(1)
-        from t_faultdetect
-        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="detectMap">
-        select id,fault_detect,describes,remarks from t_faultdetect where fault_detect
-        like #{name}
-    </select>
-
-</mapper>

target/classes/mapping/FaultDao.xml

@@ -0,0 +1,25 @@
+<?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.zglc.kg.dao.FaultDao">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.zglc.kg.entity.FaultEntity" id="faultMap">
+        <result property="id" column="id"/>
+        <result property="fault_name" column="fault_name"/>
+        <result property="describes" column="describes"/>
+        <result property="remarks" column="remarks"/>
+    </resultMap>
+
+    <select id="listAll" resultMap="faultMap">
+        select *
+        from t_fault
+        where id > 0
+    </select>
+
+    <select id="findByName" parameterType="String" resultMap="faultMap">
+        select  * from t_fault
+        where fault_name like #{name}
+    </select>
+
+</mapper>

target/classes/mapping/FaultDetectDao.xml

@@ -1,39 +0,0 @@
-<?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.zglc.kg.dao.FaultDetectDao">
-
-    <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.zglc.kg.entity.FaultDetectEntity" id="detectMap">
-        <result property="id" column="id"/>
-        <result property="faultDetect" column="fault_detect"/>
-        <result property="describes" column="describes"/>
-        <result property="remarks" column="remarks"/>
-    </resultMap>
-
-    <select id="listAll" resultMap="detectMap">
-        select id,fault_detect,describes,remarks
-        from t_faultdetect
-        where id > 0
-    </select>
-
-    <select id="getCount" resultType="java.lang.Integer">
-        select count(1)
-        from t_faultdetect
-        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="detectMap">
-        select id,fault_detect,describes,remarks from t_faultdetect where fault_detect
-        like #{name}
-    </select>
-
-</mapper>