电气线路模块

src/main/java/com/gyee/SqlSeverTicket.java

@@ -23,7 +23,7 @@ public class SqlSeverTicket {
         String dbURL = "jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeam";
         //连接服务器和数据库
         String userName = "sa"; //默认用户名
-        String userPwd = "gyee54321"; //密码
+        String userPwd = "Gyee@321#!"; //密码
         Connection conn = null;
         try {
             Class.forName(driverName);
@@ -36,14 +36,14 @@ public class SqlSeverTicket {
 //            for(int i = 0; i < list.size(); i++){
 //                setImage(conn, "D:/document/两票相关材料/人员电子签名/电子签名thumb2/" + list.get(i).toLowerCase() +".png", list.get(i).toLowerCase());
 //            }
-//            setImage(conn, "D:/document/两票相关材料/人员电子签名/电子签名thumb/wangbing.png", "wangbing");
+            setImage(conn, "D:/document/两票相关材料/zhongmy.png", "zhongmy");
 
             //        String fileName = "wangbing.png";
 //
-        String filePath1 = "D:/document/两票相关材料/人员电子签名/电子签名2/";
-        String filePath2 = "D:/document/两票相关材料/人员电子签名/电子签名thumb2/";
-        batchThumb(filePath1, filePath2);
-//        singleThumb(filePath1, filePath2, fileName);
+//        String filePath1 = "D:/document/两票相关材料/人员电子签名/";
+//        String filePath2 = "D:/document/两票相关材料/";
+//        batchThumb(filePath1, filePath2);
+//        singleThumb(filePath1, filePath2, "zhongmy.png");
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

src/main/java/com/gyee/frame/common/exception/GlobalExceptionResolver.java

@@ -126,6 +126,6 @@ public class GlobalExceptionResolver{
     public AjaxResult loginFail(TicketException e)
     {
         logger.error("TICKET异常:", e.getMsg());
-        return AjaxResult.error(e.getMessage());
+        return AjaxResult.error(e.getCode(), e.getMessage());
     }
 }

src/main/java/com/gyee/frame/controller/ticket/Elec1SafeMeasureController.java

@@ -0,0 +1,204 @@
+package com.gyee.frame.controller.ticket;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.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.Woearthline;
+import com.gyee.frame.model.ticket.Wosafemeasure;
+import com.gyee.frame.model.ticket.Wosafety;
+import com.gyee.frame.model.ticket.Wosafetybaffle;
+import com.gyee.frame.service.ticket.WoearthlineService;
+import com.gyee.frame.service.ticket.WosafemeasureService;
+import com.gyee.frame.service.ticket.WosafetyService;
+import com.gyee.frame.service.ticket.WosafetybaffleService;
+import com.gyee.frame.util.ticket.TicketUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 电气一种工作票安全措施
+ */
+
+@RestController
+@RequestMapping("/elec1/safe/measure")
+public class Elec1SafeMeasureController {
+
+    @Autowired
+    WosafetyService wosafetyService;
+    @Autowired
+    WoearthlineService woearthlineService;
+    @Autowired
+    WosafetybaffleService wosafetybaffleService;
+    @Autowired
+    WosafemeasureService wosafemeasureService;
+
+    /**
+     * 根据主单据的 wonum 关联编号查询安全措施
+     *
+     * @param wonum
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "list")
+    public AjaxResult getSafeMeasure(@RequestParam("wonum") String wonum) {
+        // 断路器（开关）和隔离开关（刀闸）
+        List<Wosafety> dlqglkg = wosafetyService.getListSafeMeasure(wonum);
+        // 接地线和接地刀闸
+        List<Woearthline> jdxjddz = woearthlineService.getListSafeMeasure(wonum);
+        // 遮拦、标识牌
+        List<Wosafetybaffle> protectcs = wosafetybaffleService.getListOfProtectMeasure(wonum, "遮拦、标示牌");
+        // 注意事项及安全措施
+        List<Wosafemeasure> attention = wosafemeasureService.getListSafeMeasure(wonum, "ELEC1AQZYSX");
+
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("dlqglkg", dlqglkg);
+        maps.put("jdxjddz", jdxjddz);
+        maps.put("protectcs", protectcs);
+        maps.put("attention", attention);
+
+        return AjaxResult.successData(maps);
+    }
+
+    /**
+     * 编辑安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "edit")
+    public AjaxResult editSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
+        if (type.isEmpty())
+            return AjaxResult.error(4004, "数据更新失败");
+
+        if (type.equals("dlqglkg")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafety measure = JSON.toJavaObject(jsonObject, Wosafety.class);
+
+            boolean result = wosafetyService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        } else if (type.equals("jdxjddz")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Woearthline measure = JSON.toJavaObject(jsonObject, Woearthline.class);
+
+            boolean result = woearthlineService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        } else 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, "数据更新失败");
+        } else if (type.equals("attention")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafemeasure measure = JSON.toJavaObject(jsonObject, Wosafemeasure.class);
+
+            boolean result = wosafemeasureService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }
+
+        return AjaxResult.success("数据更新成功");
+    }
+
+    /**
+     * 根据 wonum 新增安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "create")
+    public AjaxResult createSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
+        if (type.isEmpty())
+            return AjaxResult.error(4004, "数据插入失败");
+
+        if (type.equals("dlqglkg")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafety measure = JSON.toJavaObject(jsonObject, Wosafety.class);
+            int id = wosafetyService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = wosafetyService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        } else if (type.equals("jdxjddz")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Woearthline measure = JSON.toJavaObject(jsonObject, Woearthline.class);
+            int id = woearthlineService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = woearthlineService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        } else 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, "数据插入失败");
+        } else if (type.equals("attention")) {
+            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, "数据插入失败");
+        }
+
+        return AjaxResult.success("数据添加成功");
+    }
+
+    /**
+     * 批量删除安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "delete")
+    public AjaxResult deleteSafeMeasure(@RequestParam("list") String data) {
+        Map map = TicketUtil.formatSafeMeasureElec1(data);
+        List listD = (List) map.get("dlqglkg");
+        List listJ = (List) map.get("jdxjddz");
+        List listP = (List) map.get("protectcs");
+        List listA = (List) map.get("attention");
+
+        if (listD != null && listD.size() > 0) {
+            int code = wosafetyService.deleteSafeMeasure(listD);
+            if (code <= 0)
+                return AjaxResult.error(4004, "数据删除失败");
+        }
+        if (listJ != null && listJ.size() > 0) {
+            int code = woearthlineService.deleteSafeMeasure(listJ);
+            if (code <= 0)
+                return AjaxResult.success("数据删除失败");
+        }
+        if (listP != null && listP.size() > 0) {
+            int code = wosafetybaffleService.deleteSafeMeasure(listJ);
+            if (code <= 0)
+                return AjaxResult.success("数据删除失败");
+        }
+        if (listA != null && listA.size() > 0) {
+            int code = wosafemeasureService.deleteSafeMeasure(listA);
+            if (code <= 0)
+                return AjaxResult.success("数据删除失败");
+        }
+
+        return AjaxResult.success("数据删除成功");
+    }
+}

src/main/java/com/gyee/frame/controller/ticket/Elec2SafeMeasureController.java

@@ -0,0 +1,150 @@
+package com.gyee.frame.controller.ticket;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.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.Wohaveele;
+import com.gyee.frame.model.ticket.Wosafemeasure;
+import com.gyee.frame.service.ticket.WohaveeleService;
+import com.gyee.frame.service.ticket.WosafemeasureService;
+import com.gyee.frame.util.ticket.TicketUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 电气二种工作票安全措施
+ */
+
+@RestController
+@RequestMapping("/elec2/safe/measure")
+public class Elec2SafeMeasureController {
+
+    @Autowired
+    WohaveeleService wohaveeleService;
+    @Autowired
+    WosafemeasureService wosafemeasureService;
+
+
+    /**
+     * 根据主单据的 wonum 关联编号查询安全措施
+     *
+     * @param wonum
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "list")
+    public AjaxResult getSafeMeasure(@RequestParam("wonum") String wonum) {
+        // 工作条件(停电或不停电，或邻近及保留带电设备名称)
+        List<Wohaveele> condition = wohaveeleService.getListSafeMeasure(wonum);
+        // 安全措施
+        List<Wosafemeasure> safety = wosafemeasureService.getListSafeMeasure(wonum, null);
+
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("condition", condition);
+        maps.put("safety", safety);
+
+        return AjaxResult.successData(maps);
+    }
+
+    /**
+     * 编辑安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "edit")
+    public AjaxResult editSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
+        if (type.isEmpty())
+            return AjaxResult.error(4004, "数据更新失败");
+
+        if (type.equals("condition")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wohaveele measure = JSON.toJavaObject(jsonObject, Wohaveele.class);
+
+            boolean result = wohaveeleService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }
+        if (type.equals("safety")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafemeasure measure = JSON.toJavaObject(jsonObject, Wosafemeasure.class);
+
+            boolean result = wosafemeasureService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }
+
+        return AjaxResult.success("数据更新成功");
+    }
+
+    /**
+     * 根据 wonum 新增安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "create")
+    public AjaxResult createSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
+        if (type.isEmpty())
+            return AjaxResult.error(4004, "数据插入失败");
+
+        if (type.equals("condition")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wohaveele measure = JSON.toJavaObject(jsonObject, Wohaveele.class);
+            int id = wohaveeleService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = wohaveeleService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }
+        if (type.equals("safety")) {
+            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, "数据插入失败");
+        }
+        return AjaxResult.success("数据添加成功");
+    }
+
+
+    /**
+     * 批量删除安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "delete")
+    public AjaxResult deleteSafeMeasure(@RequestParam("list") String data) {
+        Map map = TicketUtil.formatSafeMeasureElec2(data);
+        List listC = (List) map.get("condition");
+        List listS = (List) map.get("safety");
+
+        if (listC != null && listC.size() > 0) {
+            int code = wohaveeleService.deleteSafeMeasure(listC);
+            if (code <= 0)
+                return AjaxResult.error(4004, "数据删除失败");
+        }
+        if (listS != null && listS.size() > 0) {
+            int code = wosafemeasureService.deleteSafeMeasure(listS);
+            if (code <= 0)
+                return AjaxResult.success("数据删除失败");
+        }
+
+        return AjaxResult.success("数据删除成功");
+    }
+}

src/main/java/com/gyee/frame/controller/ticket/FjykController.java

@@ -0,0 +1,129 @@
+package com.gyee.frame.controller.ticket;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.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.Fjyk;
+import com.gyee.frame.service.ticket.FjykService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-07-26
+ */
+@RestController
+@RequestMapping("/risk/measure")
+public class FjykController {
+
+    @Autowired
+    FjykService fjykService;
+
+
+    /**
+     * 根据主单据的 wonum 关联编号查询风险预控措施
+     *
+     * @param wonum
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "list")
+    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 = "item")
+    public AjaxResult getRiskItem(@RequestParam("id") String id) {
+        Fjyk item = fjykService.getById(id);
+        if (item == null)
+            return AjaxResult.error(4004, "数据请求异常");
+
+        return AjaxResult.successData(item);
+    }
+
+
+    /**
+     * 根据 id 删除风险预控
+     *
+     * @param id
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "delete")
+    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")
+    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 = "create")
+    public AjaxResult createRiskMeasure(@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("数据添加成功");
+    }
+}

src/main/java/com/gyee/frame/controller/ticket/LaborController.java

@@ -41,23 +41,24 @@ public class LaborController {
     @GetMapping(value = "group")
     public AjaxResult getLaborGroup(@RequestParam("role") String role, @RequestParam("dept") String dept) {
         Wfrole wfrole = wfroleService.getRole(role);
-        if (wfrole == null)
-            return AjaxResult.error(4004, "人员获取失败");
-
         List<Labor> labors = new ArrayList<>();
-        switch (wfrole.getRoletype()){
-            case "自定义类":
-                labors = laborService.getLaborOfDept(dept, role);
-                break;
-            case "人员组":
-                labors = laborService.getLaborOfPersonGroup(role);
-                break;
-            case "人员":
-                labors = laborService.getLaborOfPerson(role);
-                break;
+        if (wfrole != null){
+            switch (wfrole.getRoletype()) {
+                case "自定义类":
+                    labors = laborService.getLaborOfDept(dept, role);
+                    break;
+                case "人员组":
+                    labors = laborService.getLaborOfPersonGroup(role);
+                    break;
+                case "人员":
+                    labors = laborService.getLaborOfPerson(role);
+                    break;
+            }
+        } else {
+            labors = laborService.getLabors(dept);
         }
 
-        if (labors == null || labors.size() == 0)
+        if (labors.size() == 0)
             return AjaxResult.error(4004, "数据为空");
 
         return AjaxResult.successData(labors);
@@ -74,7 +75,7 @@ public class LaborController {
         if (role.contains("流程启动者") || role.contains("流程人员变更"))
             labors = laborService.getFlowStarter(instId);
         else
-            labors = laborService.getLaborSingle(jsonObject.getDouble("instid"), jsonObject.getString("role"));
+            labors = laborService.getLaborSingle(instId, role);
 
         if (labors == null || labors.size() == 0)
             return AjaxResult.error(4004, "数据为空");

src/main/java/com/gyee/frame/controller/ticket/Line1SafeMeasureController.java

@@ -0,0 +1,200 @@
+package com.gyee.frame.controller.ticket;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.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.*;
+import com.gyee.frame.service.ticket.*;
+import com.gyee.frame.util.ticket.TicketUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 线路一种工作票安全措施
+ */
+
+@RestController
+@RequestMapping("/line1/safe/measure")
+public class Line1SafeMeasureController {
+
+    @Autowired
+    WosafetyService wosafetyService;
+    @Autowired
+    WohaveeleService wohaveeleService;
+    @Autowired
+    WoearthlineService woearthlineService;
+    @Autowired
+    WoadditionsafemeasureService woadditionsafemeasureService;
+
+    /**
+     * 根据主单据的 wonum 关联编号查询安全措施
+     *
+     * @param wonum
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "list")
+    public AjaxResult getSafeMeasure(@RequestParam("wonum") String wonum) {
+        // 应拉开的隔离开关、断路器、应停电的范围及应设遮栏和标识牌
+        List<Wosafety> glkgdlq = wosafetyService.getListSafeMeasure(wonum);
+        // 补充安全措施
+        List<Woadditionsafemeasure> safety = woadditionsafemeasureService.getListSafeMeasure(wonum);
+        // 保留的带电线路或带电设备
+        List<Wohaveele>  hoveele = wohaveeleService.getListSafeMeasure(wonum);
+        // 应挂的接地线、应合的接地刀闸
+        List<Woearthline>  earthline = woearthlineService.getListSafeMeasure(wonum);
+
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("glkgdlq", glkgdlq);
+        maps.put("safety", safety);
+        maps.put("hoveele", hoveele);
+        maps.put("earthline", earthline);
+
+        return AjaxResult.successData(maps);
+    }
+
+    /**
+     * 编辑安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "edit")
+    public AjaxResult editSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
+        if (type.isEmpty())
+            return AjaxResult.error(4004, "数据更新失败");
+
+        if (type.equals("glkgdlq")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafety measure = JSON.toJavaObject(jsonObject, Wosafety.class);
+
+            boolean result = wosafetyService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }else if (type.equals("safety")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Woadditionsafemeasure measure = JSON.toJavaObject(jsonObject, Woadditionsafemeasure.class);
+
+            boolean result = woadditionsafemeasureService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }else if (type.equals("hoveele")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wohaveele measure = JSON.toJavaObject(jsonObject, Wohaveele.class);
+
+            boolean result = wohaveeleService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }else if (type.equals("earthline")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Woearthline measure = JSON.toJavaObject(jsonObject, Woearthline.class);
+
+            boolean result = woearthlineService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }
+
+        return AjaxResult.success("数据更新成功");
+    }
+
+    /**
+     * 根据 wonum 新增安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "create")
+    public AjaxResult createSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
+        if (type.isEmpty())
+            return AjaxResult.error(4004, "数据插入失败");
+
+        if (type.equals("glkgdlq")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafety measure = JSON.toJavaObject(jsonObject, Wosafety.class);
+            int id = wosafetyService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = wosafetyService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }else if (type.equals("safety")){
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Woadditionsafemeasure measure = JSON.toJavaObject(jsonObject, Woadditionsafemeasure.class);
+            int id = woadditionsafemeasureService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = woadditionsafemeasureService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }else if (type.equals("hoveele")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wohaveele measure = JSON.toJavaObject(jsonObject, Wohaveele.class);
+            int id = wohaveeleService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = wohaveeleService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }else if (type.equals("earthline")){
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Woearthline measure = JSON.toJavaObject(jsonObject, Woearthline.class);
+            int id = woearthlineService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = woearthlineService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }
+
+        return AjaxResult.success("数据添加成功");
+    }
+
+
+    /**
+     * 批量删除安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "delete")
+    public AjaxResult deleteSafeMeasure(@RequestParam("list") String data) {
+        Map map = TicketUtil.formatSafeMeasureLine1(data);
+        List listG = (List) map.get("glkgdlq");
+        List listS = (List) map.get("safety");
+        List listH = (List) map.get("hoveele");
+        List listE = (List) map.get("earthline");
+
+        if (listG != null && listG.size() > 0) {
+            int code = wosafetyService.deleteSafeMeasure(listG);
+            if (code <= 0)
+                return AjaxResult.error(4004, "数据删除失败");
+        }
+        if (listS != null && listS.size() > 0) {
+            int code = woadditionsafemeasureService.deleteSafeMeasure(listS);
+            if (code <= 0)
+                return AjaxResult.success("数据删除失败");
+        }
+        if (listH != null && listH.size() > 0) {
+            int code = wohaveeleService.deleteSafeMeasure(listH);
+            if (code <= 0)
+                return AjaxResult.error(4004, "数据删除失败");
+        }
+        if (listE != null && listE.size() > 0) {
+            int code = woearthlineService.deleteSafeMeasure(listE);
+            if (code <= 0)
+                return AjaxResult.success("数据删除失败");
+        }
+
+        return AjaxResult.success("数据删除成功");
+    }
+}

src/main/java/com/gyee/frame/controller/ticket/Line2SafeMeasureController.java

@@ -0,0 +1,149 @@
+package com.gyee.frame.controller.ticket;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.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.Woadditionsafemeasure;
+import com.gyee.frame.model.ticket.Wosafety;
+import com.gyee.frame.service.ticket.WoadditionsafemeasureService;
+import com.gyee.frame.service.ticket.WosafetyService;
+import com.gyee.frame.util.ticket.TicketUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 线路二种工作票安全措施
+ */
+
+@RestController
+@RequestMapping("/line2/safe/measure")
+public class Line2SafeMeasureController {
+
+    @Autowired
+    WosafetyService wosafetyService;
+    @Autowired
+    WoadditionsafemeasureService woadditionsafemeasureService;
+
+    /**
+     * 根据主单据的 wonum 关联编号查询安全措施
+     *
+     * @param wonum
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "list")
+    public AjaxResult getSafeMeasure(@RequestParam("wonum") String wonum) {
+        // 工作条件(停电或不停电，或邻近及保留带电设备名称)
+        List<Wosafety> condition = wosafetyService.getListSafeMeasure(wonum);
+        // 安全措施
+        List<Woadditionsafemeasure> safety = woadditionsafemeasureService.getListSafeMeasure(wonum);
+
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("condition", condition);
+        maps.put("safety", safety);
+
+        return AjaxResult.successData(maps);
+    }
+
+    /**
+     * 编辑安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "edit")
+    public AjaxResult editSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
+        if (type.isEmpty())
+            return AjaxResult.error(4004, "数据更新失败");
+
+        if (type.equals("condition")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafety measure = JSON.toJavaObject(jsonObject, Wosafety.class);
+
+            boolean result = wosafetyService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }
+        if (type.equals("safety")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Woadditionsafemeasure measure = JSON.toJavaObject(jsonObject, Woadditionsafemeasure.class);
+
+            boolean result = woadditionsafemeasureService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }
+
+        return AjaxResult.success("数据更新成功");
+    }
+
+    /**
+     * 根据 wonum 新增安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "create")
+    public AjaxResult createSafeMeasure(@RequestParam("data") String data, @RequestParam("type") String type) {
+        if (type.isEmpty())
+            return AjaxResult.error(4004, "数据插入失败");
+
+        if (type.equals("condition")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosafety measure = JSON.toJavaObject(jsonObject, Wosafety.class);
+            int id = wosafetyService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = wosafetyService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }
+        if (type.equals("safety")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Woadditionsafemeasure measure = JSON.toJavaObject(jsonObject, Woadditionsafemeasure.class);
+            int id = woadditionsafemeasureService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = woadditionsafemeasureService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }
+        return AjaxResult.success("数据添加成功");
+    }
+
+
+    /**
+     * 批量删除安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "delete")
+    public AjaxResult deleteSafeMeasure(@RequestParam("list") String data) {
+        Map map = TicketUtil.formatSafeMeasureLine2(data);
+        List listC = (List) map.get("condition");
+        List listS = (List) map.get("safety");
+
+        if (listC != null && listC.size() > 0) {
+            int code = wosafetyService.deleteSafeMeasure(listC);
+            if (code <= 0)
+                return AjaxResult.error(4004, "数据删除失败");
+        }
+        if (listS != null && listS.size() > 0) {
+            int code = woadditionsafemeasureService.deleteSafeMeasure(listS);
+            if (code <= 0)
+                return AjaxResult.success("数据删除失败");
+        }
+
+        return AjaxResult.success("数据删除成功");
+    }
+}

src/main/java/com/gyee/frame/controller/ticket/WindSafeMeasureController.java

@@ -0,0 +1,155 @@
+package com.gyee.frame.controller.ticket;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.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.Wosafemeasure;
+import com.gyee.frame.model.ticket.Wosafetybaffle;
+import com.gyee.frame.service.ticket.WosafemeasureService;
+import com.gyee.frame.service.ticket.WosafetybaffleService;
+import com.gyee.frame.util.ticket.TicketUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 风机检修工作票安全措施
+ */
+@RestController
+@RequestMapping("/wind/safe/measure")
+public class WindSafeMeasureController {
+
+    @Autowired
+    WosafemeasureService wosafemeasureService;
+    @Autowired
+    WosafetybaffleService wosafetybaffleService;
+
+    /**
+     * 根据主单据的 wonum 关联编号查询安全措施
+     *
+     * @param wonum
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "list")
+    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);
+    }
+
+
+    /**
+     * 编辑安全措施
+     *
+     * @param data
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @PostMapping(value = "edit")
+    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 = "create")
+    public AjaxResult createSafeMeasure(@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")
+    public AjaxResult deleteSafeMeasure(@RequestParam("list") String data) {
+        Map map = TicketUtil.formatSafeMeasureWind(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("数据删除成功");
+    }
+}

src/main/java/com/gyee/frame/controller/ticket/WorkticketController.java

@@ -33,12 +33,6 @@ public class WorkticketController {
     @Autowired
     WoworktaskService woworktaskService;
     @Autowired
-    WosafemeasureService wosafemeasureService;
-    @Autowired
-    WosafetybaffleService wosafetybaffleService;
-    @Autowired
-    FjykService fjykService;
-    @Autowired
     ShiroService shiroService;
 
     /**
@@ -71,87 +65,25 @@ public class WorkticketController {
      * @return
      */
     @DataSource(value = DataSourceType.TICKET)
-    @GetMapping(value = "detail")
-    public AjaxResult getTicketDetail(@RequestParam("id") String id) {
+    @GetMapping(value = "item")
+    public AjaxResult getTicketItem(@RequestParam("id") String id) {
         Workticket ticket = workticketService.getById(id);
         if (ticket == null) {
             return AjaxResult.error(4004, "数据读取异常");
         }
 
-        // 工作任务
-        Woworktask task = woworktaskService.getTask(ticket.getWonum());
-        if (task != null) {
-            ticket.setWorkaddress(task.getAddress());
-            ticket.setWorktask(task.getDescription2());
+        if (!ticket.getWtickettype().contains("线路")){
+            // 工作任务
+            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
@@ -160,7 +92,7 @@ public class WorkticketController {
      * @return
      */
     @DataSource(value = DataSourceType.TICKET)
-    @PostMapping(value = "edit/ticket")
+    @PostMapping(value = "edit")
     public AjaxResult editWorkTicket(@RequestParam("data") String data) {
         JSONObject jsonObject = JSONObject.parseObject(data);
         Workticket workticket = JSON.toJavaObject(jsonObject, Workticket.class);
@@ -174,158 +106,5 @@ public class WorkticketController {
         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("数据添加成功");
-    }
 }
 

src/main/java/com/gyee/frame/mapper/ticket/WfactionMapper.java

@@ -18,9 +18,10 @@ public interface WfactionMapper extends BaseMapper<Wfaction> {
     /**
      * 流程初始化查询
      *
+     * @param wfName
      * @return
      */
     @Select("select a.* from WFPROCESS p left join WFNODE n ON p.wfrevision = n.wfrevision and p.wfname = n.wfname " +
-            "left join WFACTION a ON a.startnodeid = n.id WHERE p.wfname = '风电机组工作票' AND p.active = '是' AND a.actiontype = '空操作' AND n.nodetype='开始'")
-    Wfaction initAction();
+            "left join WFACTION a ON a.startnodeid = n.id WHERE p.wfname = #{wfName} AND p.active = '是' AND a.actiontype = '空操作' AND n.nodetype='开始'")
+    Wfaction initAction(String wfName);
 }

src/main/java/com/gyee/frame/mapper/ticket/WoadditionsafemeasureMapper.java

@@ -13,4 +13,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface WoadditionsafemeasureMapper extends BaseMapper<Woadditionsafemeasure> {
 
+    /**
+     *  查询最大id
+     * @return
+     */
+    int selectMaxId();
 }

src/main/java/com/gyee/frame/mapper/ticket/WoearthlineMapper.java

@@ -13,4 +13,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface WoearthlineMapper extends BaseMapper<Woearthline> {
 
+    /**
+     *  查询最大id
+     * @return
+     */
+    int selectMaxId();
 }

src/main/java/com/gyee/frame/mapper/ticket/WohaveeleMapper.java

@@ -13,4 +13,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface WohaveeleMapper extends BaseMapper<Wohaveele> {
 
+    /**
+     *  查询最大id
+     * @return
+     */
+    int selectMaxId();
 }

src/main/java/com/gyee/frame/mapper/ticket/WosafetyMapper.java

@@ -13,4 +13,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface WosafetyMapper extends BaseMapper<Wosafety> {
 
+    /**
+     *  查询最大id
+     * @return
+     */
+    int selectMaxId();
 }

src/main/java/com/gyee/frame/service/impl/ticket/WfactionServiceImpl.java

@@ -43,7 +43,7 @@ public class WfactionServiceImpl extends ServiceImpl<WfactionMapper, Wfaction> i
 
         // 流程未启动
         if (status == 0){
-            Wfaction wfaction = baseMapper.initAction();
+            Wfaction wfaction = baseMapper.initAction(wfName);
             Wftaskassign wftaskassign = wftaskassignService.taskAssign(wfaction.getEndnodeid(), wfaction.getWfrevision(), wfName);
             FlowAction action = new FlowAction();
             action.setDescription(wfaction.getDescription());
@@ -78,30 +78,31 @@ public class WfactionServiceImpl extends ServiceImpl<WfactionMapper, Wfaction> i
             double temp = 0.0;
             for (Wfaction wfaction : wfactions) {
                 FlowAction action = new FlowAction();
-                action.setDescription(wfaction.getDescription());
-                action.setActionType(wfaction.getActiontype());
-                action.setNextNodeId(String.valueOf(wfaction.getEndnodeid()));
-                action.setRole(taskMap.get(wfaction.getEndnodeid()));
-                action.setChecked(false);
-                action.setFilter("Y");
-
                 if (wfaction.getActiontype().equals("空操作")) {
                     action.setActionId(wfaction.getId());
+                    action.setDescription(wfaction.getDescription());
+                    action.setActionType(wfaction.getActiontype());
+                    action.setNextNodeId(String.valueOf(wfaction.getEndnodeid()));
+                    action.setRole(taskMap.get(wfaction.getEndnodeid()));
+                    action.setChecked(false);
+                    action.setFilter("N");
+                    /**
+                     * 是否为结束节点
+                     */
                     if (wfaction.getAction().contains("完成") || wfaction.getAction().contains("取消此操作")
-                            || wfaction.getAction().contains("关闭")){
+                            || wfaction.getAction().contains("关闭") || wfaction.getAction().contains("终结")){
                         action.setIsEndNode("Y");
                     }
+                    list.add(action);
                 }
                 /**
                  * 过滤重复项  判定是否需要手动选择人员
                  */
-                if (temp != wfaction.getEndnodeid()) {
-                    action.setFilter("N");
-                    list.add(action);
-                } else {
+                if (temp == wfaction.getEndnodeid()) {
                     action = list.get(list.size() - 1);
                     action.setFilter("Y");
                 }
+
                 temp = wfaction.getEndnodeid();
             }
         }
@@ -125,8 +126,8 @@ public class WfactionServiceImpl extends ServiceImpl<WfactionMapper, Wfaction> i
     }
 
     @Override
-    public Wfaction initAction() {
-        return baseMapper.initAction();
+    public Wfaction initAction(String wfName) {
+        return baseMapper.initAction(wfName);
     }
 
     @Override

src/main/java/com/gyee/frame/service/impl/ticket/WfassignmentServiceImpl.java

@@ -43,7 +43,6 @@ public class WfassignmentServiceImpl extends ServiceImpl<WfassignmentMapper, Wfa
         QueryWrapper<Wfassignment> wrapper = new QueryWrapper();
         wrapper.eq("ASSIGNCODE", labor);
         wrapper.eq("ASSIGNSTATUS", "活动");
-        wrapper.eq("APP", "WINDELEC");
         wrapper.orderByDesc("ID");
 
         Page<Wfassignment> page = new Page<>(pageNum, 15);

src/main/java/com/gyee/frame/service/impl/ticket/WfinstanceServiceImpl.java

@@ -78,7 +78,10 @@ public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinsta
          * 人员： num ===> name
          */
         List<Labor> labors = laborService.getLabors();
-        Map<String, String> laborMap = labors.stream().collect(Collectors.toMap(Labor::getLabornum, Labor::getLaborname));
+        Map<String, String> laborMap = new HashMap<>();
+        for (Labor labor : labors){
+            laborMap.put(labor.getLabornum().toLowerCase(), labor.getLaborname());
+        }
 
         /**
          * 查询流程相关历史
@@ -93,12 +96,12 @@ public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinsta
             switch (wftrans.get(i).getNodetype()) {
                 case "开始":
                     obj = new FlowStep("节点：" + nodeMap.get(wftrans.get(i).getNodeid()),
-                            "人员：" + laborMap.get(wfinstance.getStartor()),
+                            "人员：" + laborMap.get(wfinstance.getStartor().toLowerCase()),
                             "日期：" + DateUtils.format(wftrans.get(i).getTransdate().toString(), DateUtils.DATE_TIME_PATTERN));
                     break;
                 case "任务":
                     obj = new FlowStep("节点：" + nodeMap.get(wftrans.get(i).getNodeid()),
-                            "人员：" + laborMap.get(wftrans.get(i).getAssigncode()),
+                            "人员：" + laborMap.get(wftrans.get(i).getAssigncode().toLowerCase()),
                             "日期：" + DateUtils.format(wftrans.get(i).getTransdate().toString(), DateUtils.DATE_TIME_PATTERN));
                     break;
                 case "结束":
@@ -125,7 +128,7 @@ public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinsta
             List<Wfassignment> items = wfassignmentService.getActiveItem(wfinstance.getId(), wfinstance.getWfrevision(), wfinstance.getOwnerid(), "活动");
             String labor = "";
             for (int i = 0; i < items.size(); i++){
-                String code = laborMap.get(items.get(i).getAssigncode());
+                String code = laborMap.get(items.get(i).getAssigncode().toLowerCase());
                 labor = labor + " " + code;
             }
             FlowStep obj = new FlowStep("节点：" + nodeMap.get(items.get(0).getNodeid()),
@@ -166,7 +169,7 @@ public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinsta
             return false;
 
         Wfprocess process = wfprocessService.activeVersion(wfName);
-        Wfaction action = wfactionService.initAction();
+        Wfaction action = wfactionService.initAction(wfName);
         if (process == null || action == null)
             throw new RuntimeException();
 

src/main/java/com/gyee/frame/service/impl/ticket/WftransServiceImpl.java

@@ -46,6 +46,7 @@ public class WftransServiceImpl extends ServiceImpl<WftransMapper, Wftrans> impl
     public List<Wftrans> listTrans(double instanceId) {
         QueryWrapper<Wftrans> wrapper = new QueryWrapper<>();
         wrapper.eq("WFINSTID", instanceId);
+        wrapper.in("TRANSTYPE", "开始", "任务", "结束");
         wrapper.orderByAsc("ID");
 
         List<Wftrans> trans = baseMapper.selectList(wrapper);

src/main/java/com/gyee/frame/service/impl/ticket/WoadditionsafemeasureServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class WoadditionsafemeasureServiceImpl extends ServiceImpl<WoadditionsafemeasureMapper, Woadditionsafemeasure> implements WoadditionsafemeasureService {
 
+    @Override
+    public int selectMaxId() {
+        return baseMapper.selectMaxId();
+    }
+
+    @Override
+    public List<Woadditionsafemeasure> getListSafeMeasure(String woNum) {
+        QueryWrapper<Woadditionsafemeasure> wrapper = new QueryWrapper<>();
+        wrapper.eq("WONUM", woNum);
+
+        List<Woadditionsafemeasure> list = baseMapper.selectList(wrapper);
+
+        return list;
+    }
+
+    @Override
+    public Integer deleteSafeMeasure(List<Double> list) {
+        int result = baseMapper.deleteBatchIds(list);
+        return result;
+    }
 }

src/main/java/com/gyee/frame/service/impl/ticket/WoearthlineServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,25 @@ import org.springframework.stereotype.Service;
 @Service
 public class WoearthlineServiceImpl extends ServiceImpl<WoearthlineMapper, Woearthline> implements WoearthlineService {
 
+    @Override
+    public int selectMaxId() {
+        return baseMapper.selectMaxId();
+    }
+
+    @Override
+    public List<Woearthline> getListSafeMeasure(String woNum) {
+        QueryWrapper<Woearthline> wrapper = new QueryWrapper<>();
+        wrapper.eq("WONUM", woNum);
+
+        List<Woearthline> woearthlines = baseMapper.selectList(wrapper);
+
+        return woearthlines;
+    }
+
+    @Override
+    public Integer deleteSafeMeasure(List<Double> list) {
+        int result = baseMapper.deleteBatchIds(list);
+        return result;
+    }
+
 }

src/main/java/com/gyee/frame/service/impl/ticket/WohaveeleServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class WohaveeleServiceImpl extends ServiceImpl<WohaveeleMapper, Wohaveele> implements WohaveeleService {
 
+    @Override
+    public int selectMaxId() {
+        return baseMapper.selectMaxId();
+    }
+
+    @Override
+    public List<Wohaveele> getListSafeMeasure(String woNum) {
+        QueryWrapper<Wohaveele> wrapper = new QueryWrapper<>();
+        wrapper.eq("WONUM", woNum);
+
+        List<Wohaveele> list = baseMapper.selectList(wrapper);
+
+        return list;
+    }
+
+    @Override
+    public Integer deleteSafeMeasure(List<Double> list) {
+        int result = baseMapper.deleteBatchIds(list);
+        return result;
+    }
 }

src/main/java/com/gyee/frame/service/impl/ticket/WosafemeasureServiceImpl.java

@@ -26,7 +26,8 @@ public class WosafemeasureServiceImpl extends ServiceImpl<WosafemeasureMapper, W
     public List<Wosafemeasure> getListSafeMeasure(String wonum, String type) {
         QueryWrapper<Wosafemeasure> wrapper = new QueryWrapper<>();
         wrapper.eq("WONUM", wonum);
-        wrapper.eq("TYPE", type);
+        if (type != null)
+            wrapper.eq("TYPE", type);
 
         List<Wosafemeasure> list = baseMapper.selectList(wrapper);
 

src/main/java/com/gyee/frame/service/impl/ticket/WosafetyServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class WosafetyServiceImpl extends ServiceImpl<WosafetyMapper, Wosafety> implements WosafetyService {
 
+    @Override
+    public int selectMaxId() {
+        return baseMapper.selectMaxId();
+    }
+
+    @Override
+    public List<Wosafety> getListSafeMeasure(String woNum) {
+        QueryWrapper<Wosafety> wrapper = new QueryWrapper<>();
+        wrapper.eq("WONUM", woNum);
+
+        List<Wosafety> wosafeties = baseMapper.selectList(wrapper);
+
+        return wosafeties;
+    }
+
+    @Override
+    public Integer deleteSafeMeasure(List<Double> list) {
+        int result = baseMapper.deleteBatchIds(list);
+        return result;
+    }
 }

src/main/java/com/gyee/frame/service/ticket/WfactionService.java

@@ -39,9 +39,11 @@ public interface WfactionService extends IService<Wfaction> {
 
     /**
      * 流程启动需要的开始id
+     *
+     * @param wfName
      * @return
      */
-    Wfaction initAction();
+    Wfaction initAction(String wfName);
 
     /**
      * 查询工作票更新需要的状态

src/main/java/com/gyee/frame/service/ticket/WoadditionsafemeasureService.java

@@ -3,6 +3,8 @@ package com.gyee.frame.service.ticket;
 import com.gyee.frame.model.ticket.Woadditionsafemeasure;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,22 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface WoadditionsafemeasureService extends IService<Woadditionsafemeasure> {
 
+    /**
+     * 最大 id
+     * @return
+     */
+    int selectMaxId();
+
+    /**
+     * 查询安全措施
+     * @param woNum
+     * @return
+     */
+    List<Woadditionsafemeasure> getListSafeMeasure(String woNum);
+
+    /**
+     * 批量删除安全措施
+     * @param list
+     */
+    Integer deleteSafeMeasure(List<Double> list);
 }

src/main/java/com/gyee/frame/service/ticket/WoearthlineService.java

@@ -3,6 +3,8 @@ package com.gyee.frame.service.ticket;
 import com.gyee.frame.model.ticket.Woearthline;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,22 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface WoearthlineService extends IService<Woearthline> {
 
+    /**
+     * 最大 id
+     * @return
+     */
+    int selectMaxId();
+
+    /**
+     * 查询安全措施
+     * @param woNum
+     * @return
+     */
+    List<Woearthline> getListSafeMeasure(String woNum);
+
+    /**
+     * 批量删除安全措施
+     * @param list
+     */
+    Integer deleteSafeMeasure(List<Double> list);
 }

src/main/java/com/gyee/frame/service/ticket/WohaveeleService.java

@@ -3,6 +3,8 @@ package com.gyee.frame.service.ticket;
 import com.gyee.frame.model.ticket.Wohaveele;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,22 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface WohaveeleService extends IService<Wohaveele> {
 
+    /**
+     * 最大 id
+     * @return
+     */
+    int selectMaxId();
+
+    /**
+     * 查询安全措施
+     * @param woNum
+     * @return
+     */
+    List<Wohaveele> getListSafeMeasure(String woNum);
+
+    /**
+     * 批量删除安全措施
+     * @param list
+     */
+    Integer deleteSafeMeasure(List<Double> list);
 }

src/main/java/com/gyee/frame/service/ticket/WosafetyService.java

@@ -3,6 +3,8 @@ package com.gyee.frame.service.ticket;
 import com.gyee.frame.model.ticket.Wosafety;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,22 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface WosafetyService extends IService<Wosafety> {
 
+    /**
+     * 最大 id
+     * @return
+     */
+    int selectMaxId();
+
+    /**
+     * 查询安全措施
+     * @param woNum
+     * @return
+     */
+    List<Wosafety> getListSafeMeasure(String woNum);
+
+    /**
+     * 批量删除安全措施
+     * @param list
+     */
+    Integer deleteSafeMeasure(List<Double> list);
 }

src/main/java/com/gyee/frame/util/ticket/TicketUtil.java

@@ -45,10 +45,10 @@ public class TicketUtil {
             case "wind":
                 type = "风场风机";
                 break;
-            case "ele1":
+            case "elec1":
                 type = "电气一种";
                 break;
-            case "ele2":
+            case "elec2":
                 type = "电气二种";
                 break;
             case "fire1":
@@ -74,7 +74,7 @@ public class TicketUtil {
      * @param content
      * @return
      */
-    public static Map formatSafeMeasure(String content) {
+    public static Map formatSafeMeasureWind(String content) {
         if (content.isEmpty())
             return null;
 
@@ -100,6 +100,152 @@ public class TicketUtil {
     }
 
     /**
+     * 删除安全措施  格式化
+     *
+     * @param content
+     * @return
+     */
+    public static Map formatSafeMeasureElec1(String content) {
+        if (content.isEmpty())
+            return null;
+
+        String[] split = content.split(",");
+        List<Double> listD = new ArrayList<>();
+        List<Double> listJ = new ArrayList<>();
+        List<Double> listP = new ArrayList<>();
+        List<Double> listA = new ArrayList<>();
+
+        for (String str : split) {
+            if (str.endsWith("dlqglkg")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listD.add(Double.parseDouble(id));
+            } else if (str.endsWith("jdxjddz")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listJ.add(Double.parseDouble(id));
+            }else if (str.endsWith("protectcs")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listP.add(Double.parseDouble(id));
+            }else if (str.endsWith("attention")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listA.add(Double.parseDouble(id));
+            }
+        }
+
+        Map<String, List<Double>> map = new HashMap<>();
+        map.put("dlqglkg", listD);
+        map.put("jdxjddz", listJ);
+        map.put("protectcs", listP);
+        map.put("attention", listA);
+
+        return map;
+    }
+
+    /**
+     * 删除安全措施  格式化
+     *
+     * @param content
+     * @return
+     */
+    public static Map formatSafeMeasureElec2(String content) {
+        if (content.isEmpty())
+            return null;
+
+        String[] split = content.split(",");
+        List<Double> listC = new ArrayList<>();
+        List<Double> listS = new ArrayList<>();
+
+        for (String str : split) {
+            if (str.endsWith("condition")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listC.add(Double.parseDouble(id));
+            }
+            if (str.endsWith("safety")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listS.add(Double.parseDouble(id));
+            }
+        }
+
+        Map<String, List<Double>> map = new HashMap<>();
+        map.put("condition", listC);
+        map.put("safety", listS);
+
+        return map;
+    }
+
+    /**
+     * 删除安全措施  格式化
+     *
+     * @param content
+     * @return
+     */
+    public static Map formatSafeMeasureLine1(String content) {
+        if (content.isEmpty())
+            return null;
+
+        String[] split = content.split(",");
+        List<Double> listG = new ArrayList<>();
+        List<Double> listS = new ArrayList<>();
+        List<Double> listH = new ArrayList<>();
+        List<Double> listE = new ArrayList<>();
+
+        for (String str : split) {
+            if (str.endsWith("glkgdlq")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listG.add(Double.parseDouble(id));
+            } else if (str.endsWith("safety")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listS.add(Double.parseDouble(id));
+            }else if (str.endsWith("hoveele")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listH.add(Double.parseDouble(id));
+            }else if (str.endsWith("earthline")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listE.add(Double.parseDouble(id));
+            }
+        }
+
+        Map<String, List<Double>> map = new HashMap<>();
+        map.put("glkgdlq", listG);
+        map.put("safety", listS);
+        map.put("hoveele", listH);
+        map.put("earthline", listE);
+
+        return map;
+    }
+
+    /**
+     * 删除安全措施  格式化
+     *
+     * @param content
+     * @return
+     */
+    public static Map formatSafeMeasureLine2(String content) {
+        if (content.isEmpty())
+            return null;
+
+        String[] split = content.split(",");
+        List<Double> listC = new ArrayList<>();
+        List<Double> listS = new ArrayList<>();
+
+        for (String str : split) {
+            if (str.endsWith("condition")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listC.add(Double.parseDouble(id));
+            }
+            if (str.endsWith("safety")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listS.add(Double.parseDouble(id));
+            }
+        }
+
+        Map<String, List<Double>> map = new HashMap<>();
+        map.put("condition", listC);
+        map.put("safety", listS);
+
+        return map;
+    }
+
+    /**
      * 流程角色转换为人员组
      *
      * @param role

src/main/resources/mybatis/ticket/WoadditionsafemeasureMapper.xml

@@ -15,4 +15,7 @@
         ID, WONUM, SAFECONTENT, FINISHCONDITION
     </sql>
 
+    <select id="selectMaxId" resultType="Integer">
+        select max(id) from WOADDITIONSAFEMEASURE
+    </select>
 </mapper>

src/main/resources/mybatis/ticket/WoearthlineMapper.xml

@@ -33,4 +33,8 @@
         ID, WONUM, LINENUM, LINENAME, DESCRIPTION, LOCATION, EQUIPMENT, STATE, DDMS, SBMS, ADDRESS, EQNAME, ISEXECUTE, EXECUTOR, STATE1, DDMS1, SBMS1, ADDRESS1, EQNAME1, REMARK1, REMARK2, REMARK3
     </sql>
 
+    <select id="selectMaxId" resultType="Integer">
+        select max(id) from WOEARTHLINE
+    </select>
+
 </mapper>

src/main/resources/mybatis/ticket/WohaveeleMapper.xml

@@ -21,4 +21,7 @@
         ID, WONUM, ELENAME, ADDRESS, NOTICE, DDMS, SBMS, ADDITIONAL, IFBLACKOUT, WORKCONDITION
     </sql>
 
+    <select id="selectMaxId" resultType="Integer">
+        select max(id) from WOHAVEELE
+    </select>
 </mapper>

src/main/resources/mybatis/ticket/WosafetyMapper.xml

@@ -27,4 +27,8 @@
         ID, WONUM, STYLE, OPERATE, NAME, ADDRESS, NUMUNIT, ISEXECUTE, EQNAME, DDMS, SBMS, EXECUTOR, ISRESTORE, REMARK1, REMARK2, REMARK3
     </sql>
 
+    <select id="selectMaxId" resultType="Integer">
+        select max(id) from WOSAFETY
+    </select>
+
 </mapper>