增加触发器

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java

@@ -19,7 +19,7 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
     private String id;
     private String userId;
     private String examineState;
-
+    private String orderState;
     /**
      * 单据类型：入库单/出库单
      */

jyzb-biz/src/main/java/com/junmp/jyzb/controller/TriggerController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @Slf4j
@@ -49,7 +50,7 @@ public class TriggerController {
     }
     @PostMapping("/GetTriggerList")
     @ApiOperation("查询触发器列表")
-    public ApiRes<PageResult<Trigger>> GetTriggerList(@RequestBody @Validated(ValidationApi.updateStatus.class) QueryTriggerReq req) {
+    public ApiRes<List<Trigger>> GetTriggerList(@RequestBody @Validated(ValidationApi.updateStatus.class) QueryTriggerReq req) {
         return ApiRes.success(triggerService.getTriggerList(req));
     }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Trigger.java

@@ -47,7 +47,7 @@ public class Trigger implements Serializable {
     @TableField(fill = FieldFill.INSERT_UPDATE, value = "create_time")
     private Date createTime;
 
-    @TableField(fill = FieldFill.INSERT_UPDATE, value = "update_time")
+    @TableField(fill = FieldFill.UPDATE, value = "update_time")
     private Date updateTime;
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java

@@ -7,6 +7,7 @@ import com.junmp.junmpProcess.utils.RabbitMQUtils2;
 //import com.rabbitmq.client.Channel;
 //import com.rabbitmq.client.Connection;
 import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
+import com.junmp.jyzb.service.OrderMainService;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.MessageProperties;
@@ -27,6 +28,8 @@ import java.util.Map;
 
 @Component
     public class GlobalEndListener extends AbstractFlowableEngineEventListener {
+    @Resource
+    public OrderMainService orderMainService;
         protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
         @SneakyThrows
@@ -47,12 +50,15 @@ import java.util.Map;
                     String documentType = (String) processVariables.get("documentType");
                     UpdateOrderReq updateOrderReq = JSONObject.parseObject(documentType, new TypeReference<UpdateOrderReq>() {
                     });
+                    updateOrderReq.setExamineState("finished");
+                    updateOrderReq.setOrderState("ready");
+                    orderMainService.updateOrder(updateOrderReq);
                     // 获取单据类型
                     String orderReq = (String) processVariables.get("orderReq");
                     // 根据单据类型执行不同的操作
                     if ("equipment".equals(documentType)) {
                         // 执行装备相关操作,防止循环应用，丢入消息队列
-//                    orderMainService.AddOrder(updateOrderReq);
+                    orderMainService.AddOrder(updateOrderReq);
                     } else if ("personnel".equals(documentType)) {
                         // 执行人员相关操作
                         // ...

jyzb-biz/src/main/java/com/junmp/jyzb/service/OrderMainService.java

@@ -19,7 +19,7 @@ public interface OrderMainService extends IService<OrderMain> {
 
     //更新任务单
     Boolean updateOrder(UpdateOrderReq req);
-
+    Boolean ChangeOrderState(UpdateOrderReq req);
 
     //判断任务单是否存在
     OrderMain orderMainExist(String id);

jyzb-biz/src/main/java/com/junmp/jyzb/service/TriggerService.java

@@ -23,5 +23,5 @@ public interface TriggerService extends IService<Trigger> {
 
     boolean changeTriggerState(UpdateTriggerReq msg);
 
-    PageResult<Trigger> getTriggerList(QueryTriggerReq req);
+    List<Trigger> getTriggerList(QueryTriggerReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -306,6 +306,19 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         BeanPlusUtil.copyProperties(req,order);
         return this.updateById(order);
     }
+    //更新任务单（进入工作流中之后不能进行更改）
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Boolean  ChangeOrderState(UpdateOrderReq req) {
+        OrderMain order = orderMainExist(req.getId());
+        if (!order.getExamineState().equals("none"))
+        {
+            throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);
+        }
+        order.setExamineState(req.getExamineState());
+        order.setOrderState(req.getOrderState());
+        return this.updateById(order);
+    }
     public boolean hasCommonElements(List<?> list1, List<?> list2) {
         for (Object item1 : list1) {
             if (list2.contains(item1)) {

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TriggerServiceImpl.java

@@ -27,6 +27,7 @@ import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.UUID;
 @Service
 public class TriggerServiceImpl extends ServiceImpl<TriggerMapper, Trigger> implements TriggerService {
@@ -75,11 +76,12 @@ public class TriggerServiceImpl extends ServiceImpl<TriggerMapper, Trigger> impl
         return this.updateById(trigger);
     }
 
-    public PageResult<Trigger> getTriggerList(QueryTriggerReq req)
+    public List<Trigger> getTriggerList(QueryTriggerReq req)
     {
         LambdaQueryWrapper<Trigger> wrapper = createWrapper(req);
-        Page<Trigger> page = this.page(PageFactory.getDefaultPage(req.getPageNo(),req.getPageSize()), wrapper);
-        return PageResultFactory.createPageResult(page);
+        return this.list(wrapper);
+//        Page<Trigger> page = this.page(PageFactory.getDefaultPage(req.getPageNo(),req.getPageSize()), wrapper);
+//        return PageResultFactory.createPageResult(page);
     }
     private LambdaQueryWrapper<Trigger> createWrapper(QueryTriggerReq req) {
         LambdaQueryWrapper<Trigger> wrapper = new LambdaQueryWrapper<>();
@@ -91,9 +93,8 @@ public class TriggerServiceImpl extends ServiceImpl<TriggerMapper, Trigger> impl
         wrapper.eq(ObjectUtil.isNotEmpty(req.getId()), Trigger::getId, req.getId());
         wrapper.eq(ObjectUtil.isNotEmpty(req.getDelFlag()), Trigger::getDelFlag, req.getDelFlag());
 
-
-        wrapper.orderByDesc(Trigger::getCreateTime);
         wrapper.orderByDesc(Trigger::getUpdateTime);
+        wrapper.orderByDesc(Trigger::getCreateTime);
         return wrapper;
     }