Browse Source

风机检修工作票接口封装

chenminghua 4 years ago
parent
commit
d3384edff0
69 changed files with 2414 additions and 70 deletions
  1. 1 1
      src/main/java/com/gyee/MpGenerator.java
  2. 1 1
      src/main/java/com/gyee/frame/common/dataSources/DataSource.java
  3. 0 43
      src/main/java/com/gyee/frame/common/ticket/TicketUtil.java
  4. 21 0
      src/main/java/com/gyee/frame/controller/ticket/OpticketController.java
  5. 21 0
      src/main/java/com/gyee/frame/controller/ticket/OpticketlineController.java
  6. 280 23
      src/main/java/com/gyee/frame/controller/ticket/WorkticketController.java
  7. 21 0
      src/main/java/com/gyee/frame/mapper/ticket/FjykMapper.java
  8. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/OpticketMapper.java
  9. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/OpticketlineMapper.java
  10. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/WoadditionsafemeasureMapper.java
  11. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/WoearthlineMapper.java
  12. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/WohaveeleMapper.java
  13. 21 0
      src/main/java/com/gyee/frame/mapper/ticket/WosafemeasureMapper.java
  14. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/WosaferepairMapper.java
  15. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/WosaferunMapper.java
  16. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/WosafetyMapper.java
  17. 21 0
      src/main/java/com/gyee/frame/mapper/ticket/WosafetybaffleMapper.java
  18. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/WoworktaskMapper.java
  19. 97 0
      src/main/java/com/gyee/frame/model/ticket/Fjyk.java
  20. 150 0
      src/main/java/com/gyee/frame/model/ticket/Opticket.java
  21. 63 0
      src/main/java/com/gyee/frame/model/ticket/Opticketline.java
  22. 44 0
      src/main/java/com/gyee/frame/model/ticket/Woadditionsafemeasure.java
  23. 98 0
      src/main/java/com/gyee/frame/model/ticket/Woearthline.java
  24. 62 0
      src/main/java/com/gyee/frame/model/ticket/Wohaveele.java
  25. 59 0
      src/main/java/com/gyee/frame/model/ticket/Wosafemeasure.java
  26. 44 0
      src/main/java/com/gyee/frame/model/ticket/Wosaferepair.java
  27. 44 0
      src/main/java/com/gyee/frame/model/ticket/Wosaferun.java
  28. 80 0
      src/main/java/com/gyee/frame/model/ticket/Wosafety.java
  29. 80 0
      src/main/java/com/gyee/frame/model/ticket/Wosafetybaffle.java
  30. 59 0
      src/main/java/com/gyee/frame/model/ticket/Woworktask.java
  31. 38 0
      src/main/java/com/gyee/frame/service/impl/ticket/FjykServiceImpl.java
  32. 20 0
      src/main/java/com/gyee/frame/service/impl/ticket/OpticketServiceImpl.java
  33. 20 0
      src/main/java/com/gyee/frame/service/impl/ticket/OpticketlineServiceImpl.java
  34. 20 0
      src/main/java/com/gyee/frame/service/impl/ticket/WoadditionsafemeasureServiceImpl.java
  35. 20 0
      src/main/java/com/gyee/frame/service/impl/ticket/WoearthlineServiceImpl.java
  36. 20 0
      src/main/java/com/gyee/frame/service/impl/ticket/WohaveeleServiceImpl.java
  37. 1 1
      src/main/java/com/gyee/frame/service/impl/ticket/WorkticketServiceImpl.java
  38. 46 0
      src/main/java/com/gyee/frame/service/impl/ticket/WosafemeasureServiceImpl.java
  39. 20 0
      src/main/java/com/gyee/frame/service/impl/ticket/WosaferepairServiceImpl.java
  40. 20 0
      src/main/java/com/gyee/frame/service/impl/ticket/WosaferunServiceImpl.java
  41. 20 0
      src/main/java/com/gyee/frame/service/impl/ticket/WosafetyServiceImpl.java
  42. 46 0
      src/main/java/com/gyee/frame/service/impl/ticket/WosafetybaffleServiceImpl.java
  43. 32 0
      src/main/java/com/gyee/frame/service/impl/ticket/WoworktaskServiceImpl.java
  44. 31 0
      src/main/java/com/gyee/frame/service/ticket/FjykService.java
  45. 16 0
      src/main/java/com/gyee/frame/service/ticket/OpticketService.java
  46. 16 0
      src/main/java/com/gyee/frame/service/ticket/OpticketlineService.java
  47. 16 0
      src/main/java/com/gyee/frame/service/ticket/WoadditionsafemeasureService.java
  48. 16 0
      src/main/java/com/gyee/frame/service/ticket/WoearthlineService.java
  49. 16 0
      src/main/java/com/gyee/frame/service/ticket/WohaveeleService.java
  50. 37 0
      src/main/java/com/gyee/frame/service/ticket/WosafemeasureService.java
  51. 16 0
      src/main/java/com/gyee/frame/service/ticket/WosaferepairService.java
  52. 16 0
      src/main/java/com/gyee/frame/service/ticket/WosaferunService.java
  53. 16 0
      src/main/java/com/gyee/frame/service/ticket/WosafetyService.java
  54. 37 0
      src/main/java/com/gyee/frame/service/ticket/WosafetybaffleService.java
  55. 23 0
      src/main/java/com/gyee/frame/service/ticket/WoworktaskService.java
  56. 80 0
      src/main/java/com/gyee/frame/util/ticket/TicketUtil.java
  57. 1 1
      src/main/resources/application-dev.yml
  58. 39 0
      src/main/resources/mybatis/ticket/FjykMapper.xml
  59. 53 0
      src/main/resources/mybatis/ticket/OpticketMapper.xml
  60. 24 0
      src/main/resources/mybatis/ticket/OpticketlineMapper.xml
  61. 18 0
      src/main/resources/mybatis/ticket/WoadditionsafemeasureMapper.xml
  62. 36 0
      src/main/resources/mybatis/ticket/WoearthlineMapper.xml
  63. 24 0
      src/main/resources/mybatis/ticket/WohaveeleMapper.xml
  64. 26 0
      src/main/resources/mybatis/ticket/WosafemeasureMapper.xml
  65. 18 0
      src/main/resources/mybatis/ticket/WosaferepairMapper.xml
  66. 18 0
      src/main/resources/mybatis/ticket/WosaferunMapper.xml
  67. 30 0
      src/main/resources/mybatis/ticket/WosafetyMapper.xml
  68. 34 0
      src/main/resources/mybatis/ticket/WosafetybaffleMapper.xml
  69. 23 0
      src/main/resources/mybatis/ticket/WoworktaskMapper.xml

+ 1 - 1
src/main/java/com/gyee/MpGenerator.java

@@ -29,7 +29,7 @@ public class MpGenerator {
     //作者
     private static String authorName = "chenmh";
     //要生成的表名
-    private static String[] tables = {"WFASSIGNMENT","WOBUGEQ"};
+    private static String[] tables = {"s"};
     //table前缀
     private static String prefix = "";
 

+ 1 - 1
src/main/java/com/gyee/frame/common/dataSources/DataSource.java

@@ -17,5 +17,5 @@ public @interface DataSource {
 	/**
      * 切换数据源名称
      */
-	DataSourceType value() default DataSourceType.MASTER;
+	DataSourceType value() default DataSourceType.TICKET;
 }

+ 0 - 43
src/main/java/com/gyee/frame/common/ticket/TicketUtil.java

@@ -1,43 +0,0 @@
-package com.gyee.frame.common.ticket;
-
-/**
- * 工作票
- */
-public class TicketUtil {
-
-    /**
-     * 工作票类型
-     * @param type
-     * @return
-     */
-    public static String ticketType(String type){
-        if (type == null)
-            return null;
-
-        switch (type){
-            case "wind":
-                type = "风场风机";
-                break;
-            case "ele1":
-                type = "电气一种";
-                break;
-            case "ele2":
-                type = "电气二种";
-                break;
-            case "fire1":
-                type = "风场动火";
-                break;
-            case "fire2":
-                type = "二级动火";
-                break;
-            case "line1":
-                type = "线路一种";
-                break;
-            case "line2":
-                type = "线路二种";
-                break;
-        }
-
-        return type;
-    }
-}

+ 21 - 0
src/main/java/com/gyee/frame/controller/ticket/OpticketController.java

@@ -0,0 +1,21 @@
+package com.gyee.frame.controller.ticket;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@RestController
+@RequestMapping("//opticket")
+public class OpticketController {
+
+}
+

+ 21 - 0
src/main/java/com/gyee/frame/controller/ticket/OpticketlineController.java

@@ -0,0 +1,21 @@
+package com.gyee.frame.controller.ticket;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@RestController
+@RequestMapping("//opticketline")
+public class OpticketlineController {
+
+}
+

+ 280 - 23
src/main/java/com/gyee/frame/controller/ticket/WorkticketController.java

@@ -1,26 +1,24 @@
 package com.gyee.frame.controller.ticket;
 
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.gson.JsonObject;
 import com.gyee.frame.common.dataSources.DataSource;
 import com.gyee.frame.common.dataSources.DataSourceType;
 import com.gyee.frame.common.domain.AjaxResult;
-import com.gyee.frame.model.ticket.Workticket;
-import com.gyee.frame.service.ticket.WorkticketService;
+import com.gyee.frame.model.ticket.*;
+import com.gyee.frame.service.ticket.*;
+import com.gyee.frame.util.ticket.TicketUtil;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author chenmh
@@ -33,39 +31,298 @@ public class WorkticketController {
     @Autowired
     WorkticketService workticketService;
 
+    @Autowired
+    WoworktaskService woworktaskService;
+    @Autowired
+    WosafemeasureService wosafemeasureService;
+    @Autowired
+    WosafetybaffleService wosafetybaffleService;
+    @Autowired
+    FjykService fjykService;
+
     /**
      * 分页查询工作票
+     *
      * @param page
      * @param type
      * @return
      */
     @DataSource(value = DataSourceType.TICKET)
     @GetMapping(value = "list")
-    public AjaxResult getList(@Param("page")  Optional<Long> page,
-                              @Param("type") Optional<String> type){
+    public AjaxResult getList(@RequestParam("page") Optional<Long> page,
+                              @RequestParam("type") Optional<String> type) {
         Long pageNum = page.orElse(1L);
         String ticketType = type.orElse("wind");
 
         IPage<Workticket> ticket = workticketService.selectPage(pageNum, ticketType);
-        if(ticket != null)
-            return AjaxResult.successData(ticket);
-        else
-            return AjaxResult.error(4004,"数据读取异常");
+        if (ticket == null)
+            return AjaxResult.error(4004, "数据读取异常");
+
+        return AjaxResult.successData(ticket);
     }
 
     /**
-     * 根据 id 查询
+     * 根据 id 查询详情
+     *
      * @param id
      * @return
      */
     @DataSource(value = DataSourceType.TICKET)
     @GetMapping(value = "detail")
-    public AjaxResult getTicketDetail(@Param("id") String id){
+    public AjaxResult getTicketDetail(@RequestParam("id") String id) {
         Workticket ticket = workticketService.getById(id);
-        if (ticket != null)
-            return AjaxResult.successData(ticket);
-        else
-            return AjaxResult.error(4004,"数据读取异常");
+        if (ticket == null) {
+            return AjaxResult.error(4004, "数据读取异常");
+        }
+
+        // 工作任务
+        Woworktask task = woworktaskService.getTask(ticket.getWonum());
+        if (task != null) {
+            ticket.setWorkaddress(task.getAddress());
+            ticket.setWorktask(task.getDescription2());
+        }
+
+        return AjaxResult.successData(ticket);
+    }
+
+    /**
+     * 根据主单据的 wonum 关联编号查询安全措施
+     *
+     * @param wonum
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "safe/measure")
+    public AjaxResult getSafeMeasure(@RequestParam("wonum") String wonum) {
+        // 运行执行、检修自理安全措施
+        List<Wosafemeasure> yxzxaqcs = wosafemeasureService.getListSafeMeasure(wonum, "YXZXAQCS");
+        List<Wosafemeasure> jxzlaqcs = wosafemeasureService.getListSafeMeasure(wonum, "JXZLAQCS");
+
+        // 应设遮栏、应挂标示牌(注明装设地点)、应使用的安全工器具、应佩戴的防护用品
+        List<Wosafetybaffle> protectcs = wosafetybaffleService.getListOfProtectMeasure(wonum, "WINDELECZSP");
+
+        // 工作位置及相邻区域内的带电部位、孔洞、旋转部件、有限空间作业、免爬器使用等
+        List<Wosafemeasure> tooluse = wosafemeasureService.getListSafeMeasure(wonum, "AQZYSX");
+
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("yxzxaqcs", yxzxaqcs);
+        maps.put("jxzlaqcs", jxzlaqcs);
+        maps.put("protectcs", protectcs);
+        maps.put("tooluse", tooluse);
+
+        return AjaxResult.successData(maps);
+    }
+
+    /**
+     * 根据主单据的 wonum 关联编号查询风险预控措施
+     *
+     * @param wonum
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "risk/measure")
+    public AjaxResult getRiskMeasure(@RequestParam("wonum") String wonum) {
+        // 工作负责人风险预控
+        List<Fjyk> principal = fjykService.getListOfRiskMeasure(wonum, "PRINCIPAL");
+        // 许可人风险预控
+        List<Fjyk> fiatuser = fjykService.getListOfRiskMeasure(wonum, "FIATUSER");
+
+        Map<String, List> maps = new HashMap<>();
+        maps.put("principalfxyk", principal);
+        maps.put("fiatuserfxyk", fiatuser);
+
+        return AjaxResult.successData(maps);
+    }
+
+    /**
+     * 根据 id 获取风险预控详情
+     *
+     * @param id
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "risk/measure/item")
+    public AjaxResult getRiskDetail(@RequestParam("id") String id) {
+        Fjyk item = fjykService.getById(id);
+        if (item == null)
+            return AjaxResult.error(4004, "数据请求异常");
+
+        return AjaxResult.successData(item);
+    }
+
+    /**
+     * 编辑ticket
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "edit/ticket")
+    public AjaxResult editWorkTicket(@RequestParam("data") String data) {
+        JSONObject jsonObject = JSONObject.parseObject(data);
+        Workticket workticket = JSON.toJavaObject(jsonObject, Workticket.class);
+        if (workticket == null)
+            return AjaxResult.error(4004, "数据更新失败");
+
+        boolean result = workticketService.updateById(workticket);
+        if (!result)
+            return AjaxResult.error(4004, "数据更新失败");
+
+        return AjaxResult.success("数据更新成功");
+    }
+
+    /**
+     * 编辑安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "edit/safe/measure")
+    public AjaxResult editSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
+        if (type.isEmpty())
+            return AjaxResult.error(4004, "数据更新失败");
+
+        if (type.equals("jxzlaqcs") || type.equals("yxzxaqcs") || type.equals("tooluse")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafemeasure measure = JSON.toJavaObject(jsonObject, Wosafemeasure.class);
+
+            boolean result = wosafemeasureService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }
+
+        if (type.equals("protectcs")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafetybaffle measure = JSON.toJavaObject(jsonObject, Wosafetybaffle.class);
+
+            boolean result = wosafetybaffleService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }
+
+        return AjaxResult.success("数据更新成功");
+    }
+
+    /**
+     * 根据 wonum 新增安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "add/safe/measure")
+    public AjaxResult addSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
+        if (type.isEmpty())
+            return AjaxResult.error(4004, "数据插入失败");
+
+        if (type.equals("jxzlaqcs") || type.equals("yxzxaqcs") || type.equals("tooluse")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafemeasure measure = JSON.toJavaObject(jsonObject, Wosafemeasure.class);
+            int id = wosafemeasureService.selectMaxId();
+            measure.setId((double) (id + 1));
+            boolean result = wosafemeasureService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }
+
+        if (type.equals("protectcs")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafetybaffle measure = JSON.toJavaObject(jsonObject, Wosafetybaffle.class);
+            int id = wosafetybaffleService.selectMaxId();
+            measure.setId((double) (id + 1));
+            boolean result = wosafetybaffleService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }
+
+        return AjaxResult.success("数据添加成功");
+    }
+
+    /**
+     * 批量删除安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "delete/safe/measure")
+    public AjaxResult deleteSafeMeasure(@RequestParam("list") String data) {
+        Map map = TicketUtil.formatSafeMeasure(data);
+        List listS = (List) map.get("safemeasure");
+        List listW = (List) map.get("safetybaffle");
+
+        if (listS != null && listS.size() > 0) {
+            int code = wosafemeasureService.deleteSafeMeasure(listS);
+            if (code <= 0)
+                return AjaxResult.error(4004, "数据删除失败");
+        }
+        if (listW != null && listW.size() > 0) {
+            int code = wosafetybaffleService.deleteSafeMeasure(listW);
+            if (code <= 0)
+                return AjaxResult.success("数据删除失败");
+        }
+
+        return AjaxResult.success("数据删除成功");
+    }
+
+    /**
+     * 根据 id 删除风险预控
+     *
+     * @param id
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "delete/risk/measure")
+    public AjaxResult deleteRiskMeasure(@RequestParam("id") String id) {
+        boolean result = fjykService.removeById(id);
+        if (!result)
+            return AjaxResult.error(4004, "数据删除失败");
+
+        return AjaxResult.success("数据删除成功");
+    }
+
+    /**
+     * 编辑风险预控
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "edit/risk/measure")
+    public AjaxResult editRiskMeasure(@RequestParam("data") String data) {
+        JSONObject jsonObject = JSONObject.parseObject(data);
+        Fjyk fjyk = JSON.toJavaObject(jsonObject, Fjyk.class);
+
+        boolean result = fjykService.updateById(fjyk);
+        if (!result)
+            return AjaxResult.error(4004, "数据更新失败");
+
+        return AjaxResult.success("数据更新成功");
+    }
+
+    /**
+     * 根据 wonum 新增风险预控
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "add/risk/measure")
+    public AjaxResult addRiskMeasure(@RequestParam("data") String data) {
+        JSONObject jsonObject = JSONObject.parseObject(data);
+        Fjyk fjyk = JSON.toJavaObject(jsonObject, Fjyk.class);
+        if (fjyk == null)
+            return AjaxResult.error(4004, "数据插入失败");
+
+        int id = fjykService.selectMaxId();
+        fjyk.setId((double) (id + 1));
+
+        boolean save = fjykService.save(fjyk);
+        if (!save)
+            return AjaxResult.error(4004, "数据插入失败");
+
+        return AjaxResult.success("数据添加成功");
     }
 }
 

+ 21 - 0
src/main/java/com/gyee/frame/mapper/ticket/FjykMapper.java

@@ -0,0 +1,21 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Fjyk;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface FjykMapper extends BaseMapper<Fjyk> {
+
+    /**
+     *  查询最大id
+     * @return
+     */
+    int selectMaxId();
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/OpticketMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Opticket;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface OpticketMapper extends BaseMapper<Opticket> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/OpticketlineMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Opticketline;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface OpticketlineMapper extends BaseMapper<Opticketline> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/WoadditionsafemeasureMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Woadditionsafemeasure;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WoadditionsafemeasureMapper extends BaseMapper<Woadditionsafemeasure> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/WoearthlineMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Woearthline;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WoearthlineMapper extends BaseMapper<Woearthline> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/WohaveeleMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Wohaveele;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WohaveeleMapper extends BaseMapper<Wohaveele> {
+
+}

+ 21 - 0
src/main/java/com/gyee/frame/mapper/ticket/WosafemeasureMapper.java

@@ -0,0 +1,21 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Wosafemeasure;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WosafemeasureMapper extends BaseMapper<Wosafemeasure> {
+
+    /**
+     *  查询最大id
+     * @return
+     */
+    int selectMaxId();
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/WosaferepairMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Wosaferepair;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WosaferepairMapper extends BaseMapper<Wosaferepair> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/WosaferunMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Wosaferun;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WosaferunMapper extends BaseMapper<Wosaferun> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/WosafetyMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Wosafety;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WosafetyMapper extends BaseMapper<Wosafety> {
+
+}

+ 21 - 0
src/main/java/com/gyee/frame/mapper/ticket/WosafetybaffleMapper.java

@@ -0,0 +1,21 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Wosafetybaffle;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WosafetybaffleMapper extends BaseMapper<Wosafetybaffle> {
+
+    /**
+     *  查询最大id
+     * @return
+     */
+    int selectMaxId();
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/WoworktaskMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Woworktask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WoworktaskMapper extends BaseMapper<Woworktask> {
+
+}

+ 97 - 0
src/main/java/com/gyee/frame/model/ticket/Fjyk.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("FJYK")
+public class Fjyk extends Model<Fjyk> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("GZRW")
+    private String gzrw;
+
+    @TableField("GZDD")
+    private String gzdd;
+
+    @TableField("ZYXZLX")
+    private String zyxzlx;
+
+    @TableField("SBSSFX")
+    private String sbssfx;
+
+    @TableField("XCHJFX")
+    private String xchjfx;
+
+    @TableField("ZYGCFX")
+    private String zygcfx;
+
+    @TableField("RYYSFX")
+    private String ryysfx;
+
+    @TableField("FHYJFX")
+    private String fhyjfx;
+
+    @TableField("GJQJFX")
+    private String gjqjfx;
+
+    @TableField("RSSHFX")
+    private String rsshfx;
+
+    @TableField("YKCS")
+    private String ykcs;
+
+    @TableField("YKXGJBZCS")
+    private String ykxgjbzcs;
+
+    @TableField("BEMARK1")
+    private Date bemark1;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("WORKETNUM")
+    private String worketnum;
+
+    @TableField("BEMARK2")
+    private Date bemark2;
+
+    @TableField("BEMARK3")
+    private Double bemark3;
+
+    @TableField("BEMARK4")
+    private Double bemark4;
+
+    @TableField("BEMARK5")
+    private String bemark5;
+
+    @TableField("TYPE")
+    private String type;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 150 - 0
src/main/java/com/gyee/frame/model/ticket/Opticket.java

@@ -0,0 +1,150 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("OPTICKET")
+public class Opticket extends Model<Opticket> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("TKNUM")
+    private String tknum;
+
+    @TableField("DESCRIPTION")
+    private String description;
+
+    @TableField("LOCATION")
+    private String location;
+
+    @TableField("EQNUM")
+    private String eqnum;
+
+    @TableField("OPLABOR")
+    private String oplabor;
+
+    @TableField("CHECKBY")
+    private String checkby;
+
+    @TableField("PERMITTER")
+    private String permitter;
+
+    @TableField("ENTERBY")
+    private String enterby;
+
+    @TableField("STARTDATE")
+    private LocalDateTime startdate;
+
+    @TableField("ENDDATE")
+    private LocalDateTime enddate;
+
+    @TableField("ISSTD")
+    private String isstd;
+
+    @TableField("STDTICKET")
+    private String stdticket;
+
+    @TableField("TICKTYPE")
+    private String ticktype;
+
+    @TableField("CREWID")
+    private String crewid;
+
+    @TableField("SHIFTNUM")
+    private String shiftnum;
+
+    @TableField("REMARK")
+    private String remark;
+
+    @TableField("OUTDATE")
+    private LocalDateTime outdate;
+
+    @TableField("OPERTYPE")
+    private String opertype;
+
+    @TableField("PRINUSER")
+    private String prinuser;
+
+    @TableField("TURNNUM")
+    private String turnnum;
+
+    @TableField("LEADER")
+    private String leader;
+
+    @TableField("DISPATCHNUM")
+    private String dispatchnum;
+
+    @TableField("DISNUMDESCRIP")
+    private String disnumdescrip;
+
+    @TableField("STATUS")
+    private String status;
+
+    @TableField("STATUSDATE")
+    private LocalDateTime statusdate;
+
+    @TableField("TICKETSTATUS")
+    private String ticketstatus;
+
+    @TableField("CHECKSTATE")
+    private String checkstate;
+
+    @TableField("CHECKDATE")
+    private LocalDateTime checkdate;
+
+    @TableField("CHECKPERSON")
+    private String checkperson;
+
+    @TableField("CHECKQUESTION")
+    private String checkquestion;
+
+    @TableField("SITENUM")
+    private String sitenum;
+
+    @TableField("CORPNUM")
+    private String corpnum;
+
+    @TableField("OPLABORNAME")
+    private String oplaborname;
+
+    @TableField("CHECKBYNAME")
+    private String checkbyname;
+
+    @TableField("PERMITTERNAME")
+    private String permittername;
+
+    @TableField("ENTERBYNAME")
+    private String enterbyname;
+
+    @TableField("CHECKPERSONNAME")
+    private String checkpersonname;
+
+    @TableField("OTNUM")
+    private String otnum;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 63 - 0
src/main/java/com/gyee/frame/model/ticket/Opticketline.java

@@ -0,0 +1,63 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("OPTICKETLINE")
+public class Opticketline extends Model<Opticketline> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("TKNUM")
+    private String tknum;
+
+    @TableField("LINENUM")
+    private Double linenum;
+
+    @TableField("DESCRIPTION")
+    private String description;
+
+    @TableField("OPGUIDE")
+    private String opguide;
+
+    @TableField("REMARK")
+    private String remark;
+
+    @TableField("LINEDATE")
+    private LocalDateTime linedate;
+
+    @TableField("ISTRYOUT")
+    private String istryout;
+
+    @TableField("CMDITEM")
+    private String cmditem;
+
+    @TableField("OTNUM")
+    private String otnum;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 44 - 0
src/main/java/com/gyee/frame/model/ticket/Woadditionsafemeasure.java

@@ -0,0 +1,44 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("WOADDITIONSAFEMEASURE")
+public class Woadditionsafemeasure extends Model<Woadditionsafemeasure> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("SAFECONTENT")
+    private String safecontent;
+
+    @TableField("FINISHCONDITION")
+    private String finishcondition;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 98 - 0
src/main/java/com/gyee/frame/model/ticket/Woearthline.java

@@ -0,0 +1,98 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("WOEARTHLINE")
+public class Woearthline extends Model<Woearthline> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("LINENUM")
+    private String linenum;
+
+    @TableField("LINENAME")
+    private String linename;
+
+    @TableField("DESCRIPTION")
+    private String description;
+
+    @TableField("LOCATION")
+    private String location;
+
+    @TableField("EQUIPMENT")
+    private String equipment;
+
+    @TableField("STATE")
+    private String state;
+
+    @TableField("DDMS")
+    private String ddms;
+
+    @TableField("SBMS")
+    private String sbms;
+
+    @TableField("ADDRESS")
+    private String address;
+
+    @TableField("EQNAME")
+    private String eqname;
+
+    @TableField("ISEXECUTE")
+    private String isexecute;
+
+    @TableField("EXECUTOR")
+    private String executor;
+
+    @TableField("STATE1")
+    private String state1;
+
+    @TableField("DDMS1")
+    private String ddms1;
+
+    @TableField("SBMS1")
+    private String sbms1;
+
+    @TableField("ADDRESS1")
+    private String address1;
+
+    @TableField("EQNAME1")
+    private String eqname1;
+
+    @TableField("REMARK1")
+    private String remark1;
+
+    @TableField("REMARK2")
+    private String remark2;
+
+    @TableField("REMARK3")
+    private String remark3;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 62 - 0
src/main/java/com/gyee/frame/model/ticket/Wohaveele.java

@@ -0,0 +1,62 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("WOHAVEELE")
+public class Wohaveele extends Model<Wohaveele> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("ELENAME")
+    private String elename;
+
+    @TableField("ADDRESS")
+    private String address;
+
+    @TableField("NOTICE")
+    private String notice;
+
+    @TableField("DDMS")
+    private String ddms;
+
+    @TableField("SBMS")
+    private String sbms;
+
+    @TableField("ADDITIONAL")
+    private String additional;
+
+    @TableField("IFBLACKOUT")
+    private String ifblackout;
+
+    @TableField("WORKCONDITION")
+    private String workcondition;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 59 - 0
src/main/java/com/gyee/frame/model/ticket/Wosafemeasure.java

@@ -0,0 +1,59 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("WOSAFEMEASURE")
+public class Wosafemeasure extends Model<Wosafemeasure> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("SAFECONTENT")
+    private String safecontent;
+
+    @TableField("FINISHCONDITION")
+    private String finishcondition;
+
+    @TableField("ISEXECUTE")
+    private String isexecute;
+
+    @TableField("ISRESTORE")
+    private String isrestore;
+
+    @TableField("TYPE")
+    private String type;
+
+    @TableField("EXECUTOR")
+    private String executor;
+
+    @TableField("RESTOREOR")
+    private String restoreor;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 44 - 0
src/main/java/com/gyee/frame/model/ticket/Wosaferepair.java

@@ -0,0 +1,44 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("WOSAFEREPAIR")
+public class Wosaferepair extends Model<Wosaferepair> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("ISEXECUTE")
+    private String isexecute;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 44 - 0
src/main/java/com/gyee/frame/model/ticket/Wosaferun.java

@@ -0,0 +1,44 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("WOSAFERUN")
+public class Wosaferun extends Model<Wosaferun> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("ISEXECUTE")
+    private String isexecute;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 80 - 0
src/main/java/com/gyee/frame/model/ticket/Wosafety.java

@@ -0,0 +1,80 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("WOSAFETY")
+public class Wosafety extends Model<Wosafety> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("STYLE")
+    private String style;
+
+    @TableField("OPERATE")
+    private String operate;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("ADDRESS")
+    private String address;
+
+    @TableField("NUMUNIT")
+    private String numunit;
+
+    @TableField("ISEXECUTE")
+    private String isexecute;
+
+    @TableField("EQNAME")
+    private String eqname;
+
+    @TableField("DDMS")
+    private String ddms;
+
+    @TableField("SBMS")
+    private String sbms;
+
+    @TableField("EXECUTOR")
+    private String executor;
+
+    @TableField("ISRESTORE")
+    private String isrestore;
+
+    @TableField("REMARK1")
+    private String remark1;
+
+    @TableField("REMARK2")
+    private String remark2;
+
+    @TableField("REMARK3")
+    private String remark3;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 80 - 0
src/main/java/com/gyee/frame/model/ticket/Wosafetybaffle.java

@@ -0,0 +1,80 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("WOSAFETYBAFFLE")
+public class Wosafetybaffle extends Model<Wosafetybaffle> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("STYLE")
+    private String style;
+
+    @TableField("OPERATE")
+    private String operate;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("ADDRESS")
+    private String address;
+
+    @TableField("NUMUNIT")
+    private String numunit;
+
+    @TableField("ISEXECUTE")
+    private String isexecute;
+
+    @TableField("DDMS")
+    private String ddms;
+
+    @TableField("SBMS")
+    private String sbms;
+
+    @TableField("EQNAME")
+    private String eqname;
+
+    @TableField("EXECUTOR")
+    private String executor;
+
+    @TableField("REMARK1")
+    private String remark1;
+
+    @TableField("REMARK2")
+    private String remark2;
+
+    @TableField("REMARK3")
+    private String remark3;
+
+    @TableField("RESTOREOR")
+    private String restoreor;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 59 - 0
src/main/java/com/gyee/frame/model/ticket/Woworktask.java

@@ -0,0 +1,59 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("WOWORKTASK")
+public class Woworktask extends Model<Woworktask> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("ADDRESS")
+    private String address;
+
+    @TableField("LOCATION")
+    private String location;
+
+    @TableField("EQNUM")
+    private String eqnum;
+
+    @TableField("WORKCONTENT")
+    private String workcontent;
+
+    @TableField("DESCRIPTION")
+    private String description;
+
+    @TableField("DESCRIPTION1")
+    private String description1;
+
+    @TableField("DESCRIPTION2")
+    private String description2;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 38 - 0
src/main/java/com/gyee/frame/service/impl/ticket/FjykServiceImpl.java

@@ -0,0 +1,38 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.model.ticket.Fjyk;
+import com.gyee.frame.mapper.ticket.FjykMapper;
+import com.gyee.frame.service.ticket.FjykService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Service
+public class FjykServiceImpl extends ServiceImpl<FjykMapper, Fjyk> implements FjykService {
+
+    @Override
+    public List<Fjyk> getListOfRiskMeasure(String wonum, String type) {
+        QueryWrapper<Fjyk> wrapper = new QueryWrapper<>();
+        wrapper.eq("WONUM", wonum);
+        wrapper.eq("TYPE", type);
+
+        List<Fjyk> list = baseMapper.selectList(wrapper);
+
+        return list;
+    }
+
+    @Override
+    public int selectMaxId() {
+        return baseMapper.selectMaxId();
+    }
+}

+ 20 - 0
src/main/java/com/gyee/frame/service/impl/ticket/OpticketServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.gyee.frame.model.ticket.Opticket;
+import com.gyee.frame.mapper.ticket.OpticketMapper;
+import com.gyee.frame.service.ticket.OpticketService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Service
+public class OpticketServiceImpl extends ServiceImpl<OpticketMapper, Opticket> implements OpticketService {
+
+}

+ 20 - 0
src/main/java/com/gyee/frame/service/impl/ticket/OpticketlineServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.gyee.frame.model.ticket.Opticketline;
+import com.gyee.frame.mapper.ticket.OpticketlineMapper;
+import com.gyee.frame.service.ticket.OpticketlineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Service
+public class OpticketlineServiceImpl extends ServiceImpl<OpticketlineMapper, Opticketline> implements OpticketlineService {
+
+}

+ 20 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WoadditionsafemeasureServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.gyee.frame.model.ticket.Woadditionsafemeasure;
+import com.gyee.frame.mapper.ticket.WoadditionsafemeasureMapper;
+import com.gyee.frame.service.ticket.WoadditionsafemeasureService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Service
+public class WoadditionsafemeasureServiceImpl extends ServiceImpl<WoadditionsafemeasureMapper, Woadditionsafemeasure> implements WoadditionsafemeasureService {
+
+}

+ 20 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WoearthlineServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.gyee.frame.model.ticket.Woearthline;
+import com.gyee.frame.mapper.ticket.WoearthlineMapper;
+import com.gyee.frame.service.ticket.WoearthlineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Service
+public class WoearthlineServiceImpl extends ServiceImpl<WoearthlineMapper, Woearthline> implements WoearthlineService {
+
+}

+ 20 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WohaveeleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.gyee.frame.model.ticket.Wohaveele;
+import com.gyee.frame.mapper.ticket.WohaveeleMapper;
+import com.gyee.frame.service.ticket.WohaveeleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Service
+public class WohaveeleServiceImpl extends ServiceImpl<WohaveeleMapper, Wohaveele> implements WohaveeleService {
+
+}

+ 1 - 1
src/main/java/com/gyee/frame/service/impl/ticket/WorkticketServiceImpl.java

@@ -3,7 +3,7 @@ package com.gyee.frame.service.impl.ticket;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.frame.common.ticket.TicketUtil;
+import com.gyee.frame.util.ticket.TicketUtil;
 import com.gyee.frame.model.ticket.Workticket;
 import com.gyee.frame.mapper.ticket.WorkticketMapper;
 import com.gyee.frame.service.ticket.WorkticketService;

+ 46 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WosafemeasureServiceImpl.java

@@ -0,0 +1,46 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.model.ticket.Wosafemeasure;
+import com.gyee.frame.mapper.ticket.WosafemeasureMapper;
+import com.gyee.frame.service.ticket.WosafemeasureService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Transactional
+@Service
+public class WosafemeasureServiceImpl extends ServiceImpl<WosafemeasureMapper, Wosafemeasure> implements WosafemeasureService {
+
+    @Override
+    public List<Wosafemeasure> getListSafeMeasure(String wonum, String type) {
+        QueryWrapper<Wosafemeasure> wrapper = new QueryWrapper<>();
+        wrapper.eq("WONUM", wonum);
+        wrapper.eq("TYPE", type);
+
+        List<Wosafemeasure> list = baseMapper.selectList(wrapper);
+
+        return list;
+    }
+
+    @Override
+    public Integer deleteSafeMeasure(List<Double> list) {
+        int result = baseMapper.deleteBatchIds(list);
+        return result;
+    }
+
+    @Override
+    public int selectMaxId() {
+        return baseMapper.selectMaxId();
+    }
+}

+ 20 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WosaferepairServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.gyee.frame.model.ticket.Wosaferepair;
+import com.gyee.frame.mapper.ticket.WosaferepairMapper;
+import com.gyee.frame.service.ticket.WosaferepairService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Service
+public class WosaferepairServiceImpl extends ServiceImpl<WosaferepairMapper, Wosaferepair> implements WosaferepairService {
+
+}

+ 20 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WosaferunServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.gyee.frame.model.ticket.Wosaferun;
+import com.gyee.frame.mapper.ticket.WosaferunMapper;
+import com.gyee.frame.service.ticket.WosaferunService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Service
+public class WosaferunServiceImpl extends ServiceImpl<WosaferunMapper, Wosaferun> implements WosaferunService {
+
+}

+ 20 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WosafetyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.gyee.frame.model.ticket.Wosafety;
+import com.gyee.frame.mapper.ticket.WosafetyMapper;
+import com.gyee.frame.service.ticket.WosafetyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Service
+public class WosafetyServiceImpl extends ServiceImpl<WosafetyMapper, Wosafety> implements WosafetyService {
+
+}

+ 46 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WosafetybaffleServiceImpl.java

@@ -0,0 +1,46 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.model.ticket.Wosafetybaffle;
+import com.gyee.frame.mapper.ticket.WosafetybaffleMapper;
+import com.gyee.frame.service.ticket.WosafetybaffleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Transactional
+@Service
+public class WosafetybaffleServiceImpl extends ServiceImpl<WosafetybaffleMapper, Wosafetybaffle> implements WosafetybaffleService {
+
+    @Override
+    public List<Wosafetybaffle> getListOfProtectMeasure(String wonum, String style) {
+        QueryWrapper<Wosafetybaffle> wrapper = new QueryWrapper<>();
+        wrapper.eq("WONUM", wonum);
+        wrapper.eq("STYLE", style);
+
+        List<Wosafetybaffle> list = baseMapper.selectList(wrapper);
+
+        return list;
+    }
+
+    @Override
+    public Integer deleteSafeMeasure(List<Double> list) {
+        int result = baseMapper.deleteBatchIds(list);
+        return result;
+    }
+
+    @Override
+    public int selectMaxId() {
+        return baseMapper.selectMaxId();
+    }
+}

+ 32 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WoworktaskServiceImpl.java

@@ -0,0 +1,32 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.model.ticket.Woworktask;
+import com.gyee.frame.mapper.ticket.WoworktaskMapper;
+import com.gyee.frame.service.ticket.WoworktaskService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+@Service
+public class WoworktaskServiceImpl extends ServiceImpl<WoworktaskMapper, Woworktask> implements WoworktaskService {
+
+    @Override
+    public Woworktask getTask(String wonum) {
+        QueryWrapper<Woworktask> wrapper = new QueryWrapper<>();
+        wrapper.eq("WONUM", wonum);
+
+        Woworktask task = baseMapper.selectOne(wrapper);
+
+        return task;
+    }
+}

+ 31 - 0
src/main/java/com/gyee/frame/service/ticket/FjykService.java

@@ -0,0 +1,31 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Fjyk;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface FjykService extends IService<Fjyk> {
+
+    /**
+     * 查询风险预控
+     * @param wonum
+     * @param type
+     * @return
+     */
+    List<Fjyk> getListOfRiskMeasure(String wonum, String type);
+
+    /**
+     * 最大 id
+     * @return
+     */
+    int selectMaxId();
+}

+ 16 - 0
src/main/java/com/gyee/frame/service/ticket/OpticketService.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Opticket;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface OpticketService extends IService<Opticket> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/service/ticket/OpticketlineService.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Opticketline;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface OpticketlineService extends IService<Opticketline> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/service/ticket/WoadditionsafemeasureService.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Woadditionsafemeasure;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WoadditionsafemeasureService extends IService<Woadditionsafemeasure> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/service/ticket/WoearthlineService.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Woearthline;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WoearthlineService extends IService<Woearthline> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/service/ticket/WohaveeleService.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Wohaveele;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WohaveeleService extends IService<Wohaveele> {
+
+}

+ 37 - 0
src/main/java/com/gyee/frame/service/ticket/WosafemeasureService.java

@@ -0,0 +1,37 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Wosafemeasure;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WosafemeasureService extends IService<Wosafemeasure> {
+
+    /**
+     * 查询安全措施
+     * @param wonum
+     * @param type
+     * @return
+     */
+    List<Wosafemeasure> getListSafeMeasure(String wonum, String type);
+
+    /**
+     * 批量删除安全措施
+     * @param list
+     */
+    Integer deleteSafeMeasure(List<Double> list);
+
+    /**
+     * 最大 id
+     * @return
+     */
+    int selectMaxId();
+}

+ 16 - 0
src/main/java/com/gyee/frame/service/ticket/WosaferepairService.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Wosaferepair;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WosaferepairService extends IService<Wosaferepair> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/service/ticket/WosaferunService.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Wosaferun;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WosaferunService extends IService<Wosaferun> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/service/ticket/WosafetyService.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Wosafety;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WosafetyService extends IService<Wosafety> {
+
+}

+ 37 - 0
src/main/java/com/gyee/frame/service/ticket/WosafetybaffleService.java

@@ -0,0 +1,37 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Wosafetybaffle;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WosafetybaffleService extends IService<Wosafetybaffle> {
+
+    /**
+     *  查询防护措施
+     * @param wonum
+     * @param style
+     * @return
+     */
+    List<Wosafetybaffle> getListOfProtectMeasure(String wonum, String style);
+
+    /**
+     * 批量删除安全防护措施
+     * @param list
+     */
+    Integer deleteSafeMeasure(List<Double> list);
+
+    /**
+     * 最大 id
+     * @return
+     */
+    int selectMaxId();
+}

+ 23 - 0
src/main/java/com/gyee/frame/service/ticket/WoworktaskService.java

@@ -0,0 +1,23 @@
+package com.gyee.frame.service.ticket;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.model.ticket.Woworktask;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-08
+ */
+public interface WoworktaskService extends IService<Woworktask> {
+
+    /**
+     * 根据 wonum 关联编号查询工作任务
+     * @param wonum
+     * @return
+     */
+    Woworktask getTask(String wonum);
+}

+ 80 - 0
src/main/java/com/gyee/frame/util/ticket/TicketUtil.java

@@ -0,0 +1,80 @@
+package com.gyee.frame.util.ticket;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工作票
+ */
+public class TicketUtil {
+
+    /**
+     * 工作票类型
+     *
+     * @param type
+     * @return
+     */
+    public static String ticketType(String type) {
+        if (type == null)
+            return null;
+
+        switch (type) {
+            case "wind":
+                type = "风场风机";
+                break;
+            case "ele1":
+                type = "电气一种";
+                break;
+            case "ele2":
+                type = "电气二种";
+                break;
+            case "fire1":
+                type = "风场动火";
+                break;
+            case "fire2":
+                type = "二级动火";
+                break;
+            case "line1":
+                type = "线路一种";
+                break;
+            case "line2":
+                type = "线路二种";
+                break;
+        }
+
+        return type;
+    }
+
+    /**
+     * 删除安全措施  格式化
+     *
+     * @param content
+     * @return
+     */
+    public static Map formatSafeMeasure(String content) {
+        if (content.isEmpty())
+            return null;
+
+        String[] split = content.split(",");
+        List<Double> listS = new ArrayList<>();
+        List<Double> listW = new ArrayList<>();
+
+        for (String str : split) {
+            if (str.endsWith("yxzxaqcs") || str.endsWith("jxzlaqcs") || str.endsWith("tooluse")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listS.add(Double.parseDouble(id));
+            } else if (str.endsWith("protectcs")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listW.add(Double.parseDouble(id));
+            }
+        }
+
+        Map<String, List<Double>> map = new HashMap<>();
+        map.put("safemeasure", listS);
+        map.put("safetybaffle", listW);
+
+        return map;
+    }
+}

+ 1 - 1
src/main/resources/application-dev.yml

@@ -20,7 +20,7 @@ spring:
         driver-class-name: com.mysql.jdbc.Driver
      #两票数据源
      ticket:
-        url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeam
+        url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=test
         username: sa
         password: ibs
         driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver

+ 39 - 0
src/main/resources/mybatis/ticket/FjykMapper.xml

@@ -0,0 +1,39 @@
+<?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.gyee.frame.mapper.ticket.FjykMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Fjyk">
+        <id column="ID" property="id" />
+        <result column="GZRW" property="gzrw" />
+        <result column="GZDD" property="gzdd" />
+        <result column="ZYXZLX" property="zyxzlx" />
+        <result column="SBSSFX" property="sbssfx" />
+        <result column="XCHJFX" property="xchjfx" />
+        <result column="ZYGCFX" property="zygcfx" />
+        <result column="RYYSFX" property="ryysfx" />
+        <result column="FHYJFX" property="fhyjfx" />
+        <result column="GJQJFX" property="gjqjfx" />
+        <result column="RSSHFX" property="rsshfx" />
+        <result column="YKCS" property="ykcs" />
+        <result column="YKXGJBZCS" property="ykxgjbzcs" />
+        <result column="BEMARK1" property="bemark1" />
+        <result column="WONUM" property="wonum" />
+        <result column="WORKETNUM" property="worketnum" />
+        <result column="BEMARK2" property="bemark2" />
+        <result column="BEMARK3" property="bemark3" />
+        <result column="BEMARK4" property="bemark4" />
+        <result column="BEMARK5" property="bemark5" />
+        <result column="TYPE" property="type" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, GZRW, GZDD, ZYXZLX, SBSSFX, XCHJFX, ZYGCFX, RYYSFX, FHYJFX, GJQJFX, RSSHFX, YKCS, YKXGJBZCS, BEMARK1, WONUM, WORKETNUM, BEMARK2, BEMARK3, BEMARK4, BEMARK5, TYPE
+    </sql>
+
+    <select id="selectMaxId" resultType="Integer">
+        select max(id) from FJYK
+    </select>
+
+</mapper>

+ 53 - 0
src/main/resources/mybatis/ticket/OpticketMapper.xml

@@ -0,0 +1,53 @@
+<?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.gyee.frame.mapper.ticket.OpticketMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Opticket">
+        <id column="ID" property="id" />
+        <result column="TKNUM" property="tknum" />
+        <result column="DESCRIPTION" property="description" />
+        <result column="LOCATION" property="location" />
+        <result column="EQNUM" property="eqnum" />
+        <result column="OPLABOR" property="oplabor" />
+        <result column="CHECKBY" property="checkby" />
+        <result column="PERMITTER" property="permitter" />
+        <result column="ENTERBY" property="enterby" />
+        <result column="STARTDATE" property="startdate" />
+        <result column="ENDDATE" property="enddate" />
+        <result column="ISSTD" property="isstd" />
+        <result column="STDTICKET" property="stdticket" />
+        <result column="TICKTYPE" property="ticktype" />
+        <result column="CREWID" property="crewid" />
+        <result column="SHIFTNUM" property="shiftnum" />
+        <result column="REMARK" property="remark" />
+        <result column="OUTDATE" property="outdate" />
+        <result column="OPERTYPE" property="opertype" />
+        <result column="PRINUSER" property="prinuser" />
+        <result column="TURNNUM" property="turnnum" />
+        <result column="LEADER" property="leader" />
+        <result column="DISPATCHNUM" property="dispatchnum" />
+        <result column="DISNUMDESCRIP" property="disnumdescrip" />
+        <result column="STATUS" property="status" />
+        <result column="STATUSDATE" property="statusdate" />
+        <result column="TICKETSTATUS" property="ticketstatus" />
+        <result column="CHECKSTATE" property="checkstate" />
+        <result column="CHECKDATE" property="checkdate" />
+        <result column="CHECKPERSON" property="checkperson" />
+        <result column="CHECKQUESTION" property="checkquestion" />
+        <result column="SITENUM" property="sitenum" />
+        <result column="CORPNUM" property="corpnum" />
+        <result column="OPLABORNAME" property="oplaborname" />
+        <result column="CHECKBYNAME" property="checkbyname" />
+        <result column="PERMITTERNAME" property="permittername" />
+        <result column="ENTERBYNAME" property="enterbyname" />
+        <result column="CHECKPERSONNAME" property="checkpersonname" />
+        <result column="OTNUM" property="otnum" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, TKNUM, DESCRIPTION, LOCATION, EQNUM, OPLABOR, CHECKBY, PERMITTER, ENTERBY, STARTDATE, ENDDATE, ISSTD, STDTICKET, TICKTYPE, CREWID, SHIFTNUM, REMARK, OUTDATE, OPERTYPE, PRINUSER, TURNNUM, LEADER, DISPATCHNUM, DISNUMDESCRIP, STATUS, STATUSDATE, TICKETSTATUS, CHECKSTATE, CHECKDATE, CHECKPERSON, CHECKQUESTION, SITENUM, CORPNUM, OPLABORNAME, CHECKBYNAME, PERMITTERNAME, ENTERBYNAME, CHECKPERSONNAME, OTNUM
+    </sql>
+
+</mapper>

+ 24 - 0
src/main/resources/mybatis/ticket/OpticketlineMapper.xml

@@ -0,0 +1,24 @@
+<?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.gyee.frame.mapper.ticket.OpticketlineMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Opticketline">
+        <id column="ID" property="id" />
+        <result column="TKNUM" property="tknum" />
+        <result column="LINENUM" property="linenum" />
+        <result column="DESCRIPTION" property="description" />
+        <result column="OPGUIDE" property="opguide" />
+        <result column="REMARK" property="remark" />
+        <result column="LINEDATE" property="linedate" />
+        <result column="ISTRYOUT" property="istryout" />
+        <result column="CMDITEM" property="cmditem" />
+        <result column="OTNUM" property="otnum" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, TKNUM, LINENUM, DESCRIPTION, OPGUIDE, REMARK, LINEDATE, ISTRYOUT, CMDITEM, OTNUM
+    </sql>
+
+</mapper>

+ 18 - 0
src/main/resources/mybatis/ticket/WoadditionsafemeasureMapper.xml

@@ -0,0 +1,18 @@
+<?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.gyee.frame.mapper.ticket.WoadditionsafemeasureMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Woadditionsafemeasure">
+        <id column="ID" property="id" />
+        <result column="WONUM" property="wonum" />
+        <result column="SAFECONTENT" property="safecontent" />
+        <result column="FINISHCONDITION" property="finishcondition" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, WONUM, SAFECONTENT, FINISHCONDITION
+    </sql>
+
+</mapper>

+ 36 - 0
src/main/resources/mybatis/ticket/WoearthlineMapper.xml

@@ -0,0 +1,36 @@
+<?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.gyee.frame.mapper.ticket.WoearthlineMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Woearthline">
+        <id column="ID" property="id" />
+        <result column="WONUM" property="wonum" />
+        <result column="LINENUM" property="linenum" />
+        <result column="LINENAME" property="linename" />
+        <result column="DESCRIPTION" property="description" />
+        <result column="LOCATION" property="location" />
+        <result column="EQUIPMENT" property="equipment" />
+        <result column="STATE" property="state" />
+        <result column="DDMS" property="ddms" />
+        <result column="SBMS" property="sbms" />
+        <result column="ADDRESS" property="address" />
+        <result column="EQNAME" property="eqname" />
+        <result column="ISEXECUTE" property="isexecute" />
+        <result column="EXECUTOR" property="executor" />
+        <result column="STATE1" property="state1" />
+        <result column="DDMS1" property="ddms1" />
+        <result column="SBMS1" property="sbms1" />
+        <result column="ADDRESS1" property="address1" />
+        <result column="EQNAME1" property="eqname1" />
+        <result column="REMARK1" property="remark1" />
+        <result column="REMARK2" property="remark2" />
+        <result column="REMARK3" property="remark3" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, WONUM, LINENUM, LINENAME, DESCRIPTION, LOCATION, EQUIPMENT, STATE, DDMS, SBMS, ADDRESS, EQNAME, ISEXECUTE, EXECUTOR, STATE1, DDMS1, SBMS1, ADDRESS1, EQNAME1, REMARK1, REMARK2, REMARK3
+    </sql>
+
+</mapper>

+ 24 - 0
src/main/resources/mybatis/ticket/WohaveeleMapper.xml

@@ -0,0 +1,24 @@
+<?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.gyee.frame.mapper.ticket.WohaveeleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Wohaveele">
+        <id column="ID" property="id" />
+        <result column="WONUM" property="wonum" />
+        <result column="ELENAME" property="elename" />
+        <result column="ADDRESS" property="address" />
+        <result column="NOTICE" property="notice" />
+        <result column="DDMS" property="ddms" />
+        <result column="SBMS" property="sbms" />
+        <result column="ADDITIONAL" property="additional" />
+        <result column="IFBLACKOUT" property="ifblackout" />
+        <result column="WORKCONDITION" property="workcondition" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, WONUM, ELENAME, ADDRESS, NOTICE, DDMS, SBMS, ADDITIONAL, IFBLACKOUT, WORKCONDITION
+    </sql>
+
+</mapper>

+ 26 - 0
src/main/resources/mybatis/ticket/WosafemeasureMapper.xml

@@ -0,0 +1,26 @@
+<?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.gyee.frame.mapper.ticket.WosafemeasureMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Wosafemeasure">
+        <id column="ID" property="id" />
+        <result column="WONUM" property="wonum" />
+        <result column="SAFECONTENT" property="safecontent" />
+        <result column="FINISHCONDITION" property="finishcondition" />
+        <result column="ISEXECUTE" property="isexecute" />
+        <result column="ISRESTORE" property="isrestore" />
+        <result column="TYPE" property="type" />
+        <result column="EXECUTOR" property="executor" />
+        <result column="RESTOREOR" property="restoreor" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, WONUM, SAFECONTENT, FINISHCONDITION, ISEXECUTE, ISRESTORE, TYPE, EXECUTOR, RESTOREOR
+    </sql>
+
+    <select id="selectMaxId" resultType="Integer">
+        select max(id) from WOSAFEMEASURE
+    </select>
+</mapper>

+ 18 - 0
src/main/resources/mybatis/ticket/WosaferepairMapper.xml

@@ -0,0 +1,18 @@
+<?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.gyee.frame.mapper.ticket.WosaferepairMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Wosaferepair">
+        <id column="ID" property="id" />
+        <result column="WONUM" property="wonum" />
+        <result column="NAME" property="name" />
+        <result column="ISEXECUTE" property="isexecute" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, WONUM, NAME, ISEXECUTE
+    </sql>
+
+</mapper>

+ 18 - 0
src/main/resources/mybatis/ticket/WosaferunMapper.xml

@@ -0,0 +1,18 @@
+<?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.gyee.frame.mapper.ticket.WosaferunMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Wosaferun">
+        <id column="ID" property="id" />
+        <result column="WONUM" property="wonum" />
+        <result column="NAME" property="name" />
+        <result column="ISEXECUTE" property="isexecute" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, WONUM, NAME, ISEXECUTE
+    </sql>
+
+</mapper>

+ 30 - 0
src/main/resources/mybatis/ticket/WosafetyMapper.xml

@@ -0,0 +1,30 @@
+<?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.gyee.frame.mapper.ticket.WosafetyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Wosafety">
+        <id column="ID" property="id" />
+        <result column="WONUM" property="wonum" />
+        <result column="STYLE" property="style" />
+        <result column="OPERATE" property="operate" />
+        <result column="NAME" property="name" />
+        <result column="ADDRESS" property="address" />
+        <result column="NUMUNIT" property="numunit" />
+        <result column="ISEXECUTE" property="isexecute" />
+        <result column="EQNAME" property="eqname" />
+        <result column="DDMS" property="ddms" />
+        <result column="SBMS" property="sbms" />
+        <result column="EXECUTOR" property="executor" />
+        <result column="ISRESTORE" property="isrestore" />
+        <result column="REMARK1" property="remark1" />
+        <result column="REMARK2" property="remark2" />
+        <result column="REMARK3" property="remark3" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, WONUM, STYLE, OPERATE, NAME, ADDRESS, NUMUNIT, ISEXECUTE, EQNAME, DDMS, SBMS, EXECUTOR, ISRESTORE, REMARK1, REMARK2, REMARK3
+    </sql>
+
+</mapper>

+ 34 - 0
src/main/resources/mybatis/ticket/WosafetybaffleMapper.xml

@@ -0,0 +1,34 @@
+<?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.gyee.frame.mapper.ticket.WosafetybaffleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Wosafetybaffle">
+        <id column="ID" property="id" />
+        <result column="WONUM" property="wonum" />
+        <result column="STYLE" property="style" />
+        <result column="OPERATE" property="operate" />
+        <result column="NAME" property="name" />
+        <result column="ADDRESS" property="address" />
+        <result column="NUMUNIT" property="numunit" />
+        <result column="ISEXECUTE" property="isexecute" />
+        <result column="DDMS" property="ddms" />
+        <result column="SBMS" property="sbms" />
+        <result column="EQNAME" property="eqname" />
+        <result column="EXECUTOR" property="executor" />
+        <result column="REMARK1" property="remark1" />
+        <result column="REMARK2" property="remark2" />
+        <result column="REMARK3" property="remark3" />
+        <result column="RESTOREOR" property="restoreor" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, WONUM, STYLE, OPERATE, NAME, ADDRESS, NUMUNIT, ISEXECUTE, DDMS, SBMS, EQNAME, EXECUTOR, REMARK1, REMARK2, REMARK3, RESTOREOR
+    </sql>
+
+    <select id="selectMaxId" resultType="Integer">
+        select max(id) from WOSAFETYBAFFLE
+    </select>
+
+</mapper>

+ 23 - 0
src/main/resources/mybatis/ticket/WoworktaskMapper.xml

@@ -0,0 +1,23 @@
+<?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.gyee.frame.mapper.ticket.WoworktaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Woworktask">
+        <id column="ID" property="id" />
+        <result column="WONUM" property="wonum" />
+        <result column="ADDRESS" property="address" />
+        <result column="LOCATION" property="location" />
+        <result column="EQNUM" property="eqnum" />
+        <result column="WORKCONTENT" property="workcontent" />
+        <result column="DESCRIPTION" property="description" />
+        <result column="DESCRIPTION1" property="description1" />
+        <result column="DESCRIPTION2" property="description2" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, WONUM, ADDRESS, LOCATION, EQNUM, WORKCONTENT, DESCRIPTION, DESCRIPTION1, DESCRIPTION2
+    </sql>
+
+</mapper>