动火一二种工作票模块

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

@@ -0,0 +1,152 @@
+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.Wosaferepair;
+import com.gyee.frame.model.ticket.Wosaferun;
+import com.gyee.frame.service.ticket.WosaferepairService;
+import com.gyee.frame.service.ticket.WosaferunService;
+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("/fire1/safe/measure")
+public class Fire1SafeMeasureController {
+
+    @Autowired
+    WosaferunService wosaferunService;
+    @Autowired
+    WosaferepairService wosaferepairService;
+
+
+    /**
+     * 根据主单据的 wonum 关联编号查询安全措施
+     *
+     * @param wonum
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "list")
+    public AjaxResult getSafeMeasure(@RequestParam("wonum") String wonum) {
+        // 运行部门应采取的安全措施
+        List<Wosaferun> saferun = wosaferunService.getListSafeMeasure(wonum);
+        // 动火部门应采取的安全措施
+        List<Wosaferepair> saferepair = wosaferepairService.getListSafeMeasure(wonum);
+
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("saferun", saferun);
+        maps.put("saferepair", saferepair);
+
+        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("saferun")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosaferun measure = JSON.toJavaObject(jsonObject, Wosaferun.class);
+
+            boolean result = wosaferunService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }
+        if (type.equals("saferepair")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosaferepair measure = JSON.toJavaObject(jsonObject, Wosaferepair.class);
+
+            boolean result = wosaferepairService.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("saferun")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosaferun measure = JSON.toJavaObject(jsonObject, Wosaferun.class);
+            int id = wosaferunService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = wosaferunService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }
+        if (type.equals("saferepair")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosaferepair measure = JSON.toJavaObject(jsonObject, Wosaferepair.class);
+            int id = wosaferepairService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = wosaferepairService.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.formatSafeMeasureFire1(data);
+        List listC = (List) map.get("saferun");
+        List listS = (List) map.get("saferepair");
+
+        if (listC != null && listC.size() > 0) {
+            int code = wosaferunService.deleteSafeMeasure(listC);
+            if (code <= 0)
+                return AjaxResult.error(4004, "数据删除失败");
+        }
+        if (listS != null && listS.size() > 0) {
+            int code = wosaferepairService.deleteSafeMeasure(listS);
+            if (code <= 0)
+                return AjaxResult.success("数据删除失败");
+        }
+
+        return AjaxResult.success("数据删除成功");
+    }
+}
+
+

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

@@ -0,0 +1,152 @@
+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.Wosaferepair;
+import com.gyee.frame.model.ticket.Wosaferun;
+import com.gyee.frame.service.ticket.WosaferepairService;
+import com.gyee.frame.service.ticket.WosaferunService;
+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("/fire2/safe/measure")
+public class Fire2SafeMeasureController {
+
+    @Autowired
+    WosaferunService wosaferunService;
+    @Autowired
+    WosaferepairService wosaferepairService;
+
+
+    /**
+     * 根据主单据的 wonum 关联编号查询安全措施
+     *
+     * @param wonum
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "list")
+    public AjaxResult getSafeMeasure(@RequestParam("wonum") String wonum) {
+        // 运行部门应采取的安全措施
+        List<Wosaferun> saferun = wosaferunService.getListSafeMeasure(wonum);
+        // 动火部门应采取的安全措施
+        List<Wosaferepair> saferepair = wosaferepairService.getListSafeMeasure(wonum);
+
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("saferun", saferun);
+        maps.put("saferepair", saferepair);
+
+        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("saferun")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosaferun measure = JSON.toJavaObject(jsonObject, Wosaferun.class);
+
+            boolean result = wosaferunService.updateById(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据更新失败");
+        }
+        if (type.equals("saferepair")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosaferepair measure = JSON.toJavaObject(jsonObject, Wosaferepair.class);
+
+            boolean result = wosaferepairService.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("saferun")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosaferun measure = JSON.toJavaObject(jsonObject, Wosaferun.class);
+            int id = wosaferunService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = wosaferunService.save(measure);
+            if (!result)
+                return AjaxResult.error(4004, "数据插入失败");
+        }
+        if (type.equals("saferepair")) {
+            JSONObject jsonObject = JSONObject.parseObject(data);
+            Wosaferepair measure = JSON.toJavaObject(jsonObject, Wosaferepair.class);
+            int id = wosaferunService.selectMaxId();
+            measure.setId((double) (id + 1));
+
+            boolean result = wosaferepairService.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.formatSafeMeasureFire1(data);
+        List listC = (List) map.get("saferun");
+        List listS = (List) map.get("saferepair");
+
+        if (listC != null && listC.size() > 0) {
+            int code = wosaferunService.deleteSafeMeasure(listC);
+            if (code <= 0)
+                return AjaxResult.error(4004, "数据删除失败");
+        }
+        if (listS != null && listS.size() > 0) {
+            int code = wosaferepairService.deleteSafeMeasure(listS);
+            if (code <= 0)
+                return AjaxResult.success("数据删除失败");
+        }
+
+        return AjaxResult.success("数据删除成功");
+    }
+}
+
+

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

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

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

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

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

@@ -176,7 +176,12 @@ public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinsta
         // 生成描述
         String description = process.getWfinstdesc();
         description = description.replace(":{ticketnum}", ticketNum);
-        description = description.replace(":{principal}", principal);
+
+        if (wfName.contains("动火")){
+            description = description.replace(":{fireprincipal}", principal);
+        } else {
+            description = description.replace(":{principal}", principal);
+        }
 
         int id = selectMaxId();
         Wfinstance instance = new Wfinstance();

src/main/java/com/gyee/frame/service/impl/ticket/WosaferepairServiceImpl.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.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;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class WosaferepairServiceImpl extends ServiceImpl<WosaferepairMapper, Wosaferepair> implements WosaferepairService {
 
+    @Override
+    public int selectMaxId() {
+        return baseMapper.selectMaxId();
+    }
+
+    @Override
+    public List<Wosaferepair> getListSafeMeasure(String woNum) {
+        QueryWrapper<Wosaferepair> wrapper = new QueryWrapper<>();
+        wrapper.eq("WONUM", woNum);
+
+        List<Wosaferepair> 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/WosaferunServiceImpl.java

@@ -1,11 +1,15 @@
 package com.gyee.frame.service.impl.ticket;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.frame.model.ticket.Wosaferun;
 import com.gyee.frame.mapper.ticket.WosaferunMapper;
+import com.gyee.frame.model.ticket.Wosafety;
 import com.gyee.frame.service.ticket.WosaferunService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +21,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class WosaferunServiceImpl extends ServiceImpl<WosaferunMapper, Wosaferun> implements WosaferunService {
 
+    @Override
+    public int selectMaxId() {
+        return baseMapper.selectMaxId();
+    }
+
+    @Override
+    public List<Wosaferun> getListSafeMeasure(String woNum) {
+        QueryWrapper<Wosaferun> wrapper = new QueryWrapper<>();
+        wrapper.eq("WONUM", woNum);
+
+        List<Wosaferun> 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/ticket/WosaferepairService.java

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

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

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

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

@@ -172,6 +172,40 @@ public class TicketUtil {
         return map;
     }
 
+
+    /**
+     * 删除安全措施  格式化
+     *
+     * @param content
+     * @return
+     */
+    public static Map formatSafeMeasureFire1(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("saferun")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listC.add(Double.parseDouble(id));
+            }
+            if (str.endsWith("saferepair")) {
+                String id = str.substring(0, str.indexOf("-"));
+                listS.add(Double.parseDouble(id));
+            }
+        }
+
+        Map<String, List<Double>> map = new HashMap<>();
+        map.put("saferun", listC);
+        map.put("saferepair", listS);
+
+        return map;
+    }
+
+
     /**
      * 删除安全措施  格式化
      *

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

@@ -15,4 +15,9 @@
         ID, WONUM, NAME, ISEXECUTE
     </sql>
 
+
+    <select id="selectMaxId" resultType="Integer">
+        select max(id) from WOSAFEREPAIR
+    </select>
+
 </mapper>

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

@@ -15,4 +15,8 @@
         ID, WONUM, NAME, ISEXECUTE
     </sql>
 
+    <select id="selectMaxId" resultType="Integer">
+        select max(id) from WOSAFERUN
+    </select>
+
 </mapper>