Forráskód Böngészése

自增id重复bug

chenminghua 4 éve
szülő
commit
8e75604d3b
37 módosított fájl, 444 hozzáadás és 226 törlés
  1. 6 32
      src/main/java/com/gyee/frame/controller/ticket/Elec1SafeMeasureController.java
  2. 4 12
      src/main/java/com/gyee/frame/controller/ticket/Elec2SafeMeasureController.java
  3. 4 12
      src/main/java/com/gyee/frame/controller/ticket/Fire1SafeMeasureController.java
  4. 4 12
      src/main/java/com/gyee/frame/controller/ticket/Fire2SafeMeasureController.java
  5. 3 6
      src/main/java/com/gyee/frame/controller/ticket/FjykController.java
  6. 4 24
      src/main/java/com/gyee/frame/controller/ticket/Line1SafeMeasureController.java
  7. 2 12
      src/main/java/com/gyee/frame/controller/ticket/Line2SafeMeasureController.java
  8. 2 10
      src/main/java/com/gyee/frame/controller/ticket/WindSafeMeasureController.java
  9. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/IbsidgenMapper.java
  10. 47 0
      src/main/java/com/gyee/frame/model/ticket/Ibsidgen.java
  11. 20 5
      src/main/java/com/gyee/frame/service/impl/ticket/FjykServiceImpl.java
  12. 43 0
      src/main/java/com/gyee/frame/service/impl/ticket/IbsidgenServiceImpl.java
  13. 11 7
      src/main/java/com/gyee/frame/service/impl/ticket/WfassignmentServiceImpl.java
  14. 19 11
      src/main/java/com/gyee/frame/service/impl/ticket/WfinstanceServiceImpl.java
  15. 16 12
      src/main/java/com/gyee/frame/service/impl/ticket/WftransServiceImpl.java
  16. 17 2
      src/main/java/com/gyee/frame/service/impl/ticket/WoadditionsafemeasureServiceImpl.java
  17. 17 2
      src/main/java/com/gyee/frame/service/impl/ticket/WoearthlineServiceImpl.java
  18. 17 2
      src/main/java/com/gyee/frame/service/impl/ticket/WohaveeleServiceImpl.java
  19. 20 5
      src/main/java/com/gyee/frame/service/impl/ticket/WosafemeasureServiceImpl.java
  20. 17 2
      src/main/java/com/gyee/frame/service/impl/ticket/WosaferepairServiceImpl.java
  21. 17 2
      src/main/java/com/gyee/frame/service/impl/ticket/WosaferunServiceImpl.java
  22. 19 2
      src/main/java/com/gyee/frame/service/impl/ticket/WosafetyServiceImpl.java
  23. 20 5
      src/main/java/com/gyee/frame/service/impl/ticket/WosafetybaffleServiceImpl.java
  24. 7 6
      src/main/java/com/gyee/frame/service/ticket/FjykService.java
  25. 32 0
      src/main/java/com/gyee/frame/service/ticket/IbsidgenService.java
  26. 0 7
      src/main/java/com/gyee/frame/service/ticket/WfassignmentService.java
  27. 0 1
      src/main/java/com/gyee/frame/service/ticket/WfinstanceService.java
  28. 0 5
      src/main/java/com/gyee/frame/service/ticket/WftransService.java
  29. 5 3
      src/main/java/com/gyee/frame/service/ticket/WoadditionsafemeasureService.java
  30. 5 3
      src/main/java/com/gyee/frame/service/ticket/WoearthlineService.java
  31. 5 3
      src/main/java/com/gyee/frame/service/ticket/WohaveeleService.java
  32. 7 5
      src/main/java/com/gyee/frame/service/ticket/WosafemeasureService.java
  33. 4 4
      src/main/java/com/gyee/frame/service/ticket/WosaferepairService.java
  34. 4 4
      src/main/java/com/gyee/frame/service/ticket/WosaferunService.java
  35. 4 3
      src/main/java/com/gyee/frame/service/ticket/WosafetyService.java
  36. 7 5
      src/main/java/com/gyee/frame/service/ticket/WosafetybaffleService.java
  37. 19 0
      src/main/resources/mybatis/ticket/IbsidgenMapper.xml

+ 6 - 32
src/main/java/com/gyee/frame/controller/ticket/Elec1SafeMeasureController.java

@@ -5,14 +5,8 @@ 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.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.*;
@@ -125,39 +119,19 @@ public class Elec1SafeMeasureController {
         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, "数据插入失败");
+            wosafetyService.insertSafeMeasure(measure);
         } 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, "数据插入失败");
+            woearthlineService.insertSafeMeasure(measure);
         } 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, "数据插入失败");
+            wosafetybaffleService.insertSafeMeasure(measure);
         } 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, "数据插入失败");
+            wosafemeasureService.insertSafeMeasure(measure);
         }
 
         return AjaxResult.success("数据添加成功");

+ 4 - 12
src/main/java/com/gyee/frame/controller/ticket/Elec2SafeMeasureController.java

@@ -6,8 +6,10 @@ 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.Ibsidgen;
 import com.gyee.frame.model.ticket.Wohaveele;
 import com.gyee.frame.model.ticket.Wosafemeasure;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WohaveeleService;
 import com.gyee.frame.service.ticket.WosafemeasureService;
 import com.gyee.frame.util.ticket.TicketUtil;
@@ -100,22 +102,12 @@ public class Elec2SafeMeasureController {
         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, "数据插入失败");
+            wohaveeleService.insertSafeMeasure(measure);
         }
         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, "数据插入失败");
+            wosafemeasureService.insertSafeMeasure(measure);
         }
         return AjaxResult.success("数据添加成功");
     }

+ 4 - 12
src/main/java/com/gyee/frame/controller/ticket/Fire1SafeMeasureController.java

@@ -6,8 +6,10 @@ 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.Ibsidgen;
 import com.gyee.frame.model.ticket.Wosaferepair;
 import com.gyee.frame.model.ticket.Wosaferun;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WosaferepairService;
 import com.gyee.frame.service.ticket.WosaferunService;
 import com.gyee.frame.util.ticket.TicketUtil;
@@ -100,22 +102,12 @@ public class Fire1SafeMeasureController {
         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, "数据插入失败");
+            wosaferunService.insertSafeMeasure(measure);
         }
         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, "数据插入失败");
+            wosaferepairService.insertSafeMeasure(measure);
         }
         return AjaxResult.success("数据添加成功");
     }

+ 4 - 12
src/main/java/com/gyee/frame/controller/ticket/Fire2SafeMeasureController.java

@@ -6,8 +6,10 @@ 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.Ibsidgen;
 import com.gyee.frame.model.ticket.Wosaferepair;
 import com.gyee.frame.model.ticket.Wosaferun;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WosaferepairService;
 import com.gyee.frame.service.ticket.WosaferunService;
 import com.gyee.frame.util.ticket.TicketUtil;
@@ -100,22 +102,12 @@ public class Fire2SafeMeasureController {
         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, "数据插入失败");
+            wosaferunService.insertSafeMeasure(measure);
         }
         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, "数据插入失败");
+            wosaferepairService.insertSafeMeasure(measure);
         }
         return AjaxResult.success("数据添加成功");
     }

+ 3 - 6
src/main/java/com/gyee/frame/controller/ticket/FjykController.java

@@ -6,7 +6,9 @@ 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.model.ticket.Ibsidgen;
 import com.gyee.frame.service.ticket.FjykService;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -117,12 +119,7 @@ public class FjykController {
         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, "数据插入失败");
+        fjykService.insertRiskMeasure(fjyk);
 
         return AjaxResult.success("数据添加成功");
     }

+ 4 - 24
src/main/java/com/gyee/frame/controller/ticket/Line1SafeMeasureController.java

@@ -120,39 +120,19 @@ public class Line1SafeMeasureController {
         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, "数据插入失败");
+            wosafetyService.insertSafeMeasure(measure);
         }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, "数据插入失败");
+            woadditionsafemeasureService.insertSafeMeasure(measure);
         }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, "数据插入失败");
+            wohaveeleService.insertSafeMeasure(measure);
         }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, "数据插入失败");
+            woearthlineService.insertSafeMeasure(measure);
         }
 
         return AjaxResult.success("数据添加成功");

+ 2 - 12
src/main/java/com/gyee/frame/controller/ticket/Line2SafeMeasureController.java

@@ -99,22 +99,12 @@ public class Line2SafeMeasureController {
         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, "数据插入失败");
+            wosafetyService.insertSafeMeasure(measure);
         }
         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, "数据插入失败");
+            woadditionsafemeasureService.insertSafeMeasure(measure);
         }
         return AjaxResult.success("数据添加成功");
     }

+ 2 - 10
src/main/java/com/gyee/frame/controller/ticket/WindSafeMeasureController.java

@@ -106,21 +106,13 @@ public class WindSafeMeasureController {
         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, "数据插入失败");
+            wosafemeasureService.insertSafeMeasure(measure);
         }
 
         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, "数据插入失败");
+            wosafetybaffleService.insertSafeMeasure(measure);
         }
 
         return AjaxResult.success("数据添加成功");

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

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

+ 47 - 0
src/main/java/com/gyee/frame/model/ticket/Ibsidgen.java

@@ -0,0 +1,47 @@
+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-08-13
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("IBSIDGEN")
+public class Ibsidgen extends Model<Ibsidgen> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Double id;
+
+    @TableField("TABLENAME")
+    private String tablename;
+
+    @TableField("SEED")
+    private Double seed;
+
+    @TableField("IDVALUE")
+    private Double idvalue;
+
+    @TableField("MEMO")
+    private String memo;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

+ 20 - 5
src/main/java/com/gyee/frame/service/impl/ticket/FjykServiceImpl.java

@@ -1,10 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.common.exception.TicketException;
 import com.gyee.frame.model.ticket.Fjyk;
 import com.gyee.frame.mapper.ticket.FjykMapper;
+import com.gyee.frame.model.ticket.Ibsidgen;
 import com.gyee.frame.service.ticket.FjykService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.frame.service.ticket.IbsidgenService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,6 +24,22 @@ import java.util.List;
 @Service
 public class FjykServiceImpl extends ServiceImpl<FjykMapper, Fjyk> implements FjykService {
 
+    @Autowired
+    IbsidgenService ibsidgenService;
+
+    @Override
+    public void insertRiskMeasure(Fjyk obj) {
+        Ibsidgen gen = ibsidgenService.selectId("FJYK");
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
+        obj.setId(id);
+        int result = baseMapper.insert(obj);
+
+        if (result== 0)
+            throw new TicketException("数据添加失败");
+    }
+
     @Override
     public List<Fjyk> getListOfRiskMeasure(String wonum, String type) {
         QueryWrapper<Fjyk> wrapper = new QueryWrapper<>();
@@ -30,9 +50,4 @@ public class FjykServiceImpl extends ServiceImpl<FjykMapper, Fjyk> implements Fj
 
         return list;
     }
-
-    @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
-    }
 }

+ 43 - 0
src/main/java/com/gyee/frame/service/impl/ticket/IbsidgenServiceImpl.java

@@ -0,0 +1,43 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.common.exception.TicketException;
+import com.gyee.frame.model.ticket.Ibsidgen;
+import com.gyee.frame.mapper.ticket.IbsidgenMapper;
+import com.gyee.frame.service.ticket.IbsidgenService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-08-13
+ */
+@Service
+public class IbsidgenServiceImpl extends ServiceImpl<IbsidgenMapper, Ibsidgen> implements IbsidgenService {
+
+
+    @Override
+    public Ibsidgen selectId(String table) {
+        QueryWrapper<Ibsidgen> wrapper = new QueryWrapper<>();
+        wrapper.eq("TABLENAME", table);
+
+        Ibsidgen ibsidgen = baseMapper.selectOne(wrapper);
+
+        return ibsidgen;
+    }
+
+    @Transactional
+    @Override
+    public void updateGen(Ibsidgen gen, double id) {
+        gen.setIdvalue(id);
+        int result = baseMapper.updateById(gen);
+
+        if (result== 0)
+            throw new TicketException("数据更新失败");
+    }
+}

+ 11 - 7
src/main/java/com/gyee/frame/service/impl/ticket/WfassignmentServiceImpl.java

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.frame.common.exception.TicketException;
+import com.gyee.frame.model.ticket.Ibsidgen;
 import com.gyee.frame.model.ticket.Wfassignment;
 import com.gyee.frame.mapper.ticket.WfassignmentMapper;
 import com.gyee.frame.model.ticket.Wftaskassign;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WfassignmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.frame.service.ticket.WftaskassignService;
@@ -31,14 +33,11 @@ import java.util.List;
 public class WfassignmentServiceImpl extends ServiceImpl<WfassignmentMapper, Wfassignment> implements WfassignmentService {
 
     @Autowired
+    IbsidgenService ibsidgenService;
+    @Autowired
     WftaskassignService wftaskassignService;
 
     @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
-    }
-
-    @Override
     public IPage<Wfassignment> selectPage(String labor, long pageNum) {
         QueryWrapper<Wfassignment> wrapper = new QueryWrapper();
         wrapper.eq("ASSIGNCODE", labor);
@@ -107,12 +106,17 @@ public class WfassignmentServiceImpl extends ServiceImpl<WfassignmentMapper, Wfa
     @Override
     public boolean insertAssignment(double currNodeId, double instId, double version, double ownerId, String wfName,
                                          String ticketNum, String starter, String table, String role, List<String> labors) {
-        int maxId = selectMaxId();
+        Ibsidgen gen = ibsidgenService.selectId("WFASSIGNMENT");
         Wftaskassign task= wftaskassignService.taskAssign(currNodeId, version, wfName);
 
+        /**
+         * 统一表ID管理
+         */
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
         for (int i = 0; i < labors.size(); i++){
             Wfassignment wfassignment = new Wfassignment();
-            double id = (double)maxId + i + 1;
             wfassignment.setId(id);
             wfassignment.setDescription(task.getDescription().replace(":{TICKETNUM}", ticketNum));
             wfassignment.setAssigncode(labors.get(i));

+ 19 - 11
src/main/java/com/gyee/frame/service/impl/ticket/WfinstanceServiceImpl.java

@@ -28,6 +28,8 @@ import java.util.stream.Collectors;
 public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinstance> implements WfinstanceService {
 
     @Autowired
+    IbsidgenService ibsidgenService;
+    @Autowired
     WftransService wftransService;
     @Autowired
     WfnodeService wfnodeService;
@@ -45,11 +47,6 @@ public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinsta
     WftaskassignService wftaskassignService;
 
 
-    @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
-    }
-
     /**
      * map的status属性  0:未开始  1:结束  2:正在进行
      *
@@ -183,9 +180,12 @@ public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinsta
             description = description.replace(":{principal}", principal);
         }
 
-        int id = selectMaxId();
+        Ibsidgen gen = ibsidgenService.selectId("WFINSTANCE");
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
         Wfinstance instance = new Wfinstance();
-        instance.setId((double)id + 1);
+        instance.setId(id);
         instance.setWfname(wfName);
         instance.setWfrevision(process.getWfrevision());
         instance.setOwnertable(process.getTablename());
@@ -202,15 +202,19 @@ public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinsta
 
         Wftaskassign task= wftaskassignService.taskAssign(action.getEndnodeid(), process.getWfrevision(), wfName);
         for (int i = 0; i < labor.size(); i++){
+            Ibsidgen gen1 = ibsidgenService.selectId("WFASSIGNMENT");
+            double id1 = gen1.getIdvalue() + 1;
+            ibsidgenService.updateGen(gen1, id1);
+
             Wfassignment assignment = new Wfassignment();
             assignment.setDescription(task.getDescription().replace(":{TICKETNUM}", ticketNum));
-            assignment.setId((double)wfassignmentService.selectMaxId() + 1);
+            assignment.setId(id1);
             assignment.setAssigncode(labor.get(i));
             assignment.setApp(TicketUtil.wfNameFormat(wfName));
             assignment.setStartdate(new Date());
             assignment.setEmailnotify("否");
             assignment.setAssignstatus("活动");
-            assignment.setWfinstid((double)id + 1);
+            assignment.setWfinstid(id);
             assignment.setWfname(wfName);
             assignment.setWfrevision(process.getWfrevision());
             assignment.setInitperson("");
@@ -232,10 +236,14 @@ public class WfinstanceServiceImpl extends ServiceImpl<WfinstanceMapper, Wfinsta
                 throw new RuntimeException();
         }
 
+        Ibsidgen gen2 = ibsidgenService.selectId("WFTRANS");
+        double id2 = gen2.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen2, id2);
+
         Wftrans trans = new Wftrans();
-        trans.setId((double)wftransService.selectMaxId() + 1);
+        trans.setId(id2);
         trans.setNodeid(action.getStartnodeid());
-        trans.setWfinstid((double)id + 1);
+        trans.setWfinstid(id);
         trans.setAssignid(null);
         trans.setActionid(action.getId());
         trans.setTranstype("开始");

+ 16 - 12
src/main/java/com/gyee/frame/service/impl/ticket/WftransServiceImpl.java

@@ -1,10 +1,7 @@
 package com.gyee.frame.service.impl.ticket;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.frame.model.ticket.Wfassignment;
-import com.gyee.frame.model.ticket.Wfinstance;
-import com.gyee.frame.model.ticket.Wfnode;
-import com.gyee.frame.model.ticket.Wftrans;
+import com.gyee.frame.model.ticket.*;
 import com.gyee.frame.mapper.ticket.WftransMapper;
 import com.gyee.frame.service.ticket.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,6 +24,8 @@ import java.util.List;
 public class WftransServiceImpl extends ServiceImpl<WftransMapper, Wftrans> implements WftransService {
 
     @Autowired
+    IbsidgenService ibsidgenService;
+    @Autowired
     WfactionService wfactionService;
     @Autowired
     WfinstanceService wfinstanceService;
@@ -37,10 +36,6 @@ public class WftransServiceImpl extends ServiceImpl<WftransMapper, Wftrans> impl
     @Autowired
     WfnodeService wfnodeService;
 
-    @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
-    }
 
     @Override
     public List<Wftrans> listTrans(double instanceId) {
@@ -66,18 +61,24 @@ public class WftransServiceImpl extends ServiceImpl<WftransMapper, Wftrans> impl
         if (node == null)
             return false;
 
-        int maxId = selectMaxId();
+        Ibsidgen gen = ibsidgenService.selectId("WFTRANS");
+        double id = gen.getIdvalue();
+
         // 流程结束
         if (node.getNodetype().equals("结束")){
             wfinstanceService.updateInstance(instId, currNodeId, "否");
             // 更新之前的待办任务
             Wfassignment assignment = wfassignmentService.updateAssignment(instId, version, ownerId, wfName, processor);
             // 插入事务
-            saveTrans((double)maxId + 1, preNodeId, instId, assignment.getId(), actionId, "任务", "任务",
+            saveTrans(id += 1, preNodeId, instId, assignment.getId(), actionId, "任务", "任务",
                     wfName, version, instance.getOwnertable(), ownerId, assignment.getAssigncode());
             // 插入结束事务
-            saveTrans((double)maxId + 2, currNodeId, instId, 0, actionId, "结束", "结束",
+            saveTrans(id += 2, currNodeId, instId, 0, actionId, "结束", "结束",
                     wfName, version, instance.getOwnertable(), ownerId, assignment.getAssigncode());
+
+            //更新主键
+            ibsidgenService.updateGen(gen, id);
+
             // 更新票据状态
             workticketService.updateTicket(ownerId, preNodeId, currNodeId);
         }else {
@@ -89,9 +90,12 @@ public class WftransServiceImpl extends ServiceImpl<WftransMapper, Wftrans> impl
                     instance.getStartor(), instance.getOwnertable(), role, labors);
 
             // 插入事务
-            saveTrans((double)maxId + 1, preNodeId, instId, assignment.getId(), actionId, "任务", "任务",
+            saveTrans(id += 1, preNodeId, instId, assignment.getId(), actionId, "任务", "任务",
                     wfName, version, instance.getOwnertable(), ownerId, assignment.getAssigncode());
 
+            //更新主键
+            ibsidgenService.updateGen(gen, id);
+
             // 更新票据状态
             workticketService.updateTicket(ownerId, preNodeId, currNodeId);
         }

+ 17 - 2
src/main/java/com/gyee/frame/service/impl/ticket/WoadditionsafemeasureServiceImpl.java

@@ -1,10 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.common.exception.TicketException;
+import com.gyee.frame.model.ticket.Ibsidgen;
 import com.gyee.frame.model.ticket.Woadditionsafemeasure;
 import com.gyee.frame.mapper.ticket.WoadditionsafemeasureMapper;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WoadditionsafemeasureService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,9 +24,20 @@ import java.util.List;
 @Service
 public class WoadditionsafemeasureServiceImpl extends ServiceImpl<WoadditionsafemeasureMapper, Woadditionsafemeasure> implements WoadditionsafemeasureService {
 
+    @Autowired
+    IbsidgenService ibsidgenService;
+
     @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
+    public void insertSafeMeasure(Woadditionsafemeasure obj) {
+        Ibsidgen gen = ibsidgenService.selectId("WOADDITIONSAFEMEASURE");
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
+        obj.setId(id);
+        int result = baseMapper.insert(obj);
+
+        if (result== 0)
+            throw new TicketException("数据添加失败");
     }
 
     @Override

+ 17 - 2
src/main/java/com/gyee/frame/service/impl/ticket/WoearthlineServiceImpl.java

@@ -1,10 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.common.exception.TicketException;
+import com.gyee.frame.model.ticket.Ibsidgen;
 import com.gyee.frame.model.ticket.Woearthline;
 import com.gyee.frame.mapper.ticket.WoearthlineMapper;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WoearthlineService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,9 +24,20 @@ import java.util.List;
 @Service
 public class WoearthlineServiceImpl extends ServiceImpl<WoearthlineMapper, Woearthline> implements WoearthlineService {
 
+    @Autowired
+    IbsidgenService ibsidgenService;
+
     @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
+    public void insertSafeMeasure(Woearthline obj) {
+        Ibsidgen gen = ibsidgenService.selectId("WOEARTHLINE");
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
+        obj.setId(id);
+        int result = baseMapper.insert(obj);
+
+        if (result== 0)
+            throw new TicketException("数据添加失败");
     }
 
     @Override

+ 17 - 2
src/main/java/com/gyee/frame/service/impl/ticket/WohaveeleServiceImpl.java

@@ -1,10 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.common.exception.TicketException;
+import com.gyee.frame.model.ticket.Ibsidgen;
 import com.gyee.frame.model.ticket.Wohaveele;
 import com.gyee.frame.mapper.ticket.WohaveeleMapper;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WohaveeleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,9 +24,20 @@ import java.util.List;
 @Service
 public class WohaveeleServiceImpl extends ServiceImpl<WohaveeleMapper, Wohaveele> implements WohaveeleService {
 
+    @Autowired
+    IbsidgenService ibsidgenService;
+
     @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
+    public void insertSafeMeasure(Wohaveele obj) {
+        Ibsidgen gen = ibsidgenService.selectId("WOHAVEELE");
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
+        obj.setId(id);
+        int result = baseMapper.insert(obj);
+
+        if (result== 0)
+            throw new TicketException("数据添加失败");
     }
 
     @Override

+ 20 - 5
src/main/java/com/gyee/frame/service/impl/ticket/WosafemeasureServiceImpl.java

@@ -1,10 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.common.exception.TicketException;
+import com.gyee.frame.model.ticket.Ibsidgen;
 import com.gyee.frame.model.ticket.Wosafemeasure;
 import com.gyee.frame.mapper.ticket.WosafemeasureMapper;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WosafemeasureService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,6 +26,22 @@ import java.util.List;
 @Service
 public class WosafemeasureServiceImpl extends ServiceImpl<WosafemeasureMapper, Wosafemeasure> implements WosafemeasureService {
 
+    @Autowired
+    IbsidgenService ibsidgenService;
+
+    @Override
+    public void insertSafeMeasure(Wosafemeasure obj) {
+        Ibsidgen gen = ibsidgenService.selectId("WOSAFEMEASURE");
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
+        obj.setId(id);
+        int result = baseMapper.insert(obj);
+
+        if (result== 0)
+            throw new TicketException("数据添加失败");
+    }
+
     @Override
     public List<Wosafemeasure> getListSafeMeasure(String wonum, String type) {
         QueryWrapper<Wosafemeasure> wrapper = new QueryWrapper<>();
@@ -39,9 +59,4 @@ public class WosafemeasureServiceImpl extends ServiceImpl<WosafemeasureMapper, W
         int result = baseMapper.deleteBatchIds(list);
         return result;
     }
-
-    @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
-    }
 }

+ 17 - 2
src/main/java/com/gyee/frame/service/impl/ticket/WosaferepairServiceImpl.java

@@ -1,10 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.common.exception.TicketException;
+import com.gyee.frame.model.ticket.Ibsidgen;
 import com.gyee.frame.model.ticket.Wosaferepair;
 import com.gyee.frame.mapper.ticket.WosaferepairMapper;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WosaferepairService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,9 +24,20 @@ import java.util.List;
 @Service
 public class WosaferepairServiceImpl extends ServiceImpl<WosaferepairMapper, Wosaferepair> implements WosaferepairService {
 
+    @Autowired
+    IbsidgenService ibsidgenService;
+
     @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
+    public void insertSafeMeasure(Wosaferepair obj) {
+        Ibsidgen gen = ibsidgenService.selectId("WOSAFEREPAIR");
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
+        obj.setId(id);
+        int result = baseMapper.insert(obj);
+
+        if (result== 0)
+            throw new TicketException("数据添加失败");
     }
 
     @Override

+ 17 - 2
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.common.exception.TicketException;
+import com.gyee.frame.model.ticket.Ibsidgen;
 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.IbsidgenService;
 import com.gyee.frame.service.ticket.WosaferunService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -21,9 +25,20 @@ import java.util.List;
 @Service
 public class WosaferunServiceImpl extends ServiceImpl<WosaferunMapper, Wosaferun> implements WosaferunService {
 
+    @Autowired
+    IbsidgenService ibsidgenService;
+
     @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
+    public void insertSafeMeasure(Wosaferun obj) {
+        Ibsidgen gen = ibsidgenService.selectId("WOSAFERUN");
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
+        obj.setId(id);
+        int result = baseMapper.insert(obj);
+
+        if (result== 0)
+            throw new TicketException("数据添加失败");
     }
 
     @Override

+ 19 - 2
src/main/java/com/gyee/frame/service/impl/ticket/WosafetyServiceImpl.java

@@ -1,11 +1,16 @@
 package com.gyee.frame.service.impl.ticket;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.common.exception.TicketException;
+import com.gyee.frame.model.ticket.Ibsidgen;
 import com.gyee.frame.model.ticket.Wosafety;
 import com.gyee.frame.mapper.ticket.WosafetyMapper;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WosafetyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -20,9 +25,21 @@ import java.util.List;
 @Service
 public class WosafetyServiceImpl extends ServiceImpl<WosafetyMapper, Wosafety> implements WosafetyService {
 
+    @Autowired
+    IbsidgenService ibsidgenService;
+
+    @Transactional
     @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
+    public void insertSafeMeasure(Wosafety obj) {
+        Ibsidgen gen = ibsidgenService.selectId("WOSAFETY");
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
+        obj.setId(id);
+        int result = baseMapper.insert(obj);
+
+        if (result== 0)
+            throw new TicketException("数据添加失败");
     }
 
     @Override

+ 20 - 5
src/main/java/com/gyee/frame/service/impl/ticket/WosafetybaffleServiceImpl.java

@@ -1,10 +1,14 @@
 package com.gyee.frame.service.impl.ticket;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.common.exception.TicketException;
+import com.gyee.frame.model.ticket.Ibsidgen;
 import com.gyee.frame.model.ticket.Wosafetybaffle;
 import com.gyee.frame.mapper.ticket.WosafetybaffleMapper;
+import com.gyee.frame.service.ticket.IbsidgenService;
 import com.gyee.frame.service.ticket.WosafetybaffleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,6 +26,22 @@ import java.util.List;
 @Service
 public class WosafetybaffleServiceImpl extends ServiceImpl<WosafetybaffleMapper, Wosafetybaffle> implements WosafetybaffleService {
 
+    @Autowired
+    IbsidgenService ibsidgenService;
+
+    @Override
+    public void insertSafeMeasure(Wosafetybaffle obj) {
+        Ibsidgen gen = ibsidgenService.selectId("WOSAFETYBAFFLE");
+        double id = gen.getIdvalue() + 1;
+        ibsidgenService.updateGen(gen, id);
+
+        obj.setId(id);
+        int result = baseMapper.insert(obj);
+
+        if (result== 0)
+            throw new TicketException("数据添加失败");
+    }
+
     @Override
     public List<Wosafetybaffle> getListOfProtectMeasure(String wonum, String style) {
         QueryWrapper<Wosafetybaffle> wrapper = new QueryWrapper<>();
@@ -38,9 +58,4 @@ public class WosafetybaffleServiceImpl extends ServiceImpl<WosafetybaffleMapper,
         int result = baseMapper.deleteBatchIds(list);
         return result;
     }
-
-    @Override
-    public int selectMaxId() {
-        return baseMapper.selectMaxId();
-    }
 }

+ 7 - 6
src/main/java/com/gyee/frame/service/ticket/FjykService.java

@@ -16,16 +16,17 @@ import java.util.List;
 public interface FjykService extends IService<Fjyk> {
 
     /**
+     * 插入预控措施
+     *
+     * @param obj
+     */
+    void insertRiskMeasure(Fjyk obj);
+
+    /**
      * 查询风险预控
      * @param wonum
      * @param type
      * @return
      */
     List<Fjyk> getListOfRiskMeasure(String wonum, String type);
-
-    /**
-     * 最大 id
-     * @return
-     */
-    int selectMaxId();
 }

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

@@ -0,0 +1,32 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Ibsidgen;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-08-13
+ */
+public interface IbsidgenService extends IService<Ibsidgen> {
+
+
+    /**
+     * 查询id
+     *
+     * @param table
+     * @return
+     */
+     Ibsidgen selectId(String table);
+
+    /**
+     * 更新  --- id + 1
+     *
+     * @param gen
+     * @return
+     */
+     void updateGen(Ibsidgen gen, double id);
+}

+ 0 - 7
src/main/java/com/gyee/frame/service/ticket/WfassignmentService.java

@@ -17,13 +17,6 @@ import java.util.List;
 public interface WfassignmentService extends IService<Wfassignment> {
 
     /**
-     * 查询最大ID
-     *
-     * @return
-     */
-    int selectMaxId();
-
-    /**
      * 分页
      *
      * @param labor

+ 0 - 1
src/main/java/com/gyee/frame/service/ticket/WfinstanceService.java

@@ -16,7 +16,6 @@ import java.util.Map;
  */
 public interface WfinstanceService extends IService<Wfinstance> {
 
-    int selectMaxId();
 
     /**
      * 根据 ticketid 获取流程状态 ---- 启用 or 结束

+ 0 - 5
src/main/java/com/gyee/frame/service/ticket/WftransService.java

@@ -15,11 +15,6 @@ import java.util.List;
  */
 public interface WftransService extends IService<Wftrans> {
 
-    /**
-     * 查询最大ID
-     * @return
-     */
-    int selectMaxId();
 
     /**
      * 获取流程实例表 WFINSTANCE 所有流程历史

+ 5 - 3
src/main/java/com/gyee/frame/service/ticket/WoadditionsafemeasureService.java

@@ -16,10 +16,12 @@ import java.util.List;
 public interface WoadditionsafemeasureService extends IService<Woadditionsafemeasure> {
 
     /**
-     * 最大 id
-     * @return
+     * 插入安全措施
+     *
+     * @param obj
      */
-    int selectMaxId();
+    void insertSafeMeasure(Woadditionsafemeasure obj);
+
 
     /**
      * 查询安全措施

+ 5 - 3
src/main/java/com/gyee/frame/service/ticket/WoearthlineService.java

@@ -16,10 +16,12 @@ import java.util.List;
 public interface WoearthlineService extends IService<Woearthline> {
 
     /**
-     * 最大 id
-     * @return
+     * 插入安全措施
+     *
+     * @param obj
      */
-    int selectMaxId();
+    void insertSafeMeasure(Woearthline obj);
+
 
     /**
      * 查询安全措施

+ 5 - 3
src/main/java/com/gyee/frame/service/ticket/WohaveeleService.java

@@ -15,11 +15,13 @@ import java.util.List;
  */
 public interface WohaveeleService extends IService<Wohaveele> {
 
+
     /**
-     * 最大 id
-     * @return
+     * 插入安全措施
+     *
+     * @param obj
      */
-    int selectMaxId();
+    void insertSafeMeasure(Wohaveele obj);
 
     /**
      * 查询安全措施

+ 7 - 5
src/main/java/com/gyee/frame/service/ticket/WosafemeasureService.java

@@ -16,6 +16,13 @@ import java.util.List;
 public interface WosafemeasureService extends IService<Wosafemeasure> {
 
     /**
+     * 插入安全措施
+     *
+     * @param obj
+     */
+    void insertSafeMeasure(Wosafemeasure obj);
+
+    /**
      * 查询安全措施
      * @param wonum
      * @param type
@@ -29,9 +36,4 @@ public interface WosafemeasureService extends IService<Wosafemeasure> {
      */
     Integer deleteSafeMeasure(List<Double> list);
 
-    /**
-     * 最大 id
-     * @return
-     */
-    int selectMaxId();
 }

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

@@ -16,11 +16,11 @@ import java.util.List;
 public interface WosaferepairService extends IService<Wosaferepair> {
 
     /**
-     * 最大 id
-     * @return
+     * 插入安全措施
+     *
+     * @param obj
      */
-    int selectMaxId();
-
+    void insertSafeMeasure(Wosaferepair obj);
 
     /**
      * 查询安全措施

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

@@ -16,11 +16,11 @@ import java.util.List;
 public interface WosaferunService extends IService<Wosaferun> {
 
     /**
-     * 最大 id
-     * @return
+     * 插入安全措施
+     *
+     * @param obj
      */
-    int selectMaxId();
-
+    void insertSafeMeasure(Wosaferun obj);
 
     /**
      * 查询安全措施

+ 4 - 3
src/main/java/com/gyee/frame/service/ticket/WosafetyService.java

@@ -16,10 +16,11 @@ import java.util.List;
 public interface WosafetyService extends IService<Wosafety> {
 
     /**
-     * 最大 id
-     * @return
+     * 插入安全措施
+     *
+     * @param obj
      */
-    int selectMaxId();
+    void insertSafeMeasure(Wosafety obj);
 
     /**
      * 查询安全措施

+ 7 - 5
src/main/java/com/gyee/frame/service/ticket/WosafetybaffleService.java

@@ -16,6 +16,13 @@ import java.util.List;
 public interface WosafetybaffleService extends IService<Wosafetybaffle> {
 
     /**
+     * 插入安全措施
+     *
+     * @param obj
+     */
+    void insertSafeMeasure(Wosafetybaffle obj);
+
+    /**
      *  查询防护措施
      * @param wonum
      * @param style
@@ -29,9 +36,4 @@ public interface WosafetybaffleService extends IService<Wosafetybaffle> {
      */
     Integer deleteSafeMeasure(List<Double> list);
 
-    /**
-     * 最大 id
-     * @return
-     */
-    int selectMaxId();
 }

+ 19 - 0
src/main/resources/mybatis/ticket/IbsidgenMapper.xml

@@ -0,0 +1,19 @@
+<?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.IbsidgenMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Ibsidgen">
+        <id column="ID" property="id" />
+        <result column="TABLENAME" property="tablename" />
+        <result column="SEED" property="seed" />
+        <result column="IDVALUE" property="idvalue" />
+        <result column="MEMO" property="memo" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, TABLENAME, SEED, IDVALUE, MEMO
+    </sql>
+
+</mapper>