更新

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -28,11 +28,7 @@ public class JgUseRegistration extends BaseEntity {
 	@TableField("supervisory_code")
     private String supervisoryCode;
 
-    /**
-     * 使用单位ID
-     */
-	@TableField("use_unit_id")
-    private String useUnitId;
+
 
     /**
      * 使用单位名称
@@ -52,11 +48,7 @@ public class JgUseRegistration extends BaseEntity {
 	@TableField("audit_status")
     private String auditStatus;
 
-    /**
-     * 接收机构id
-     */
-	@TableField("receive_org_id")
-    private String receiveOrgId;
+
 
     /**
      * 接收机构
@@ -64,11 +56,7 @@ public class JgUseRegistration extends BaseEntity {
 	@TableField("receive_org_name")
     private String receiveOrgName;
 
-    /**
-     * 检验单位ID
-     */
-	@TableField("inspect_unit_id")
-    private String inspectUnitId;
+
 
     /**
      * 检验单位
@@ -118,11 +106,7 @@ public class JgUseRegistration extends BaseEntity {
 	@TableField("reg_person_name")
     private String regPersonName;
 
-    /**
-     * 安装单位ID
-     */
-	@TableField("install_unit_id")
-    private String installUnitId;
+
 
     /**
      * 安装单位名称
@@ -168,4 +152,7 @@ public class JgUseRegistration extends BaseEntity {
 
     @TableField("use_unit_credit_code")
     private String useUnitCreditCode;
+
+    @TableField("inspect_unit_credit_code")
+    private String inspectUnitCreditCode;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/WorkFlowFeginService.java

+package com.yeejoin.amos.boot.module.jg.flc.api.fegin;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.VerifyCodeAuthModel;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+//@FeignClient(value = "AMOS-API-WORKFLOW", configuration = {FeignConfiguration.class})
+@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = {MultipartSupportConfig.class})
+public interface WorkFlowFeginService {
+
+    /***
+     * 根据task_id 获取节点信息
+     *
+     * */
+    @RequestMapping(value = "/history/task/nodeInfo", method = RequestMethod.GET)
+    FeignClientResult<JSONObject> getNodeInfo(@RequestParam(value = "taskId") String taskId);
+
+
+    /***
+     *
+     * 查询当前流程对应的可执行任务，无权限级别
+     * */
+
+    @RequestMapping(value = "/task/getTaskNoAuth/{processInstanceId}", method = RequestMethod.GET)
+    JSONObject getTaskNoAuth(@PathVariable(value = "processInstanceId") String processInstanceId);
+
+    /***
+     *
+     * 获取流程审批日志
+     * */
+    @RequestMapping(value = "/task/flowLogger/{procInsId}", method = RequestMethod.GET)
+    FeignClientResult<Map<String,Object>> getFlowLogger(@PathVariable(value = "procInsId") String procInsId);
+
+
+
+    @RequestMapping(value = "/history/task/nodeInfo", method = RequestMethod.GET)
+    FeignClientResult<JSONObject> getNodeInfotoken(
+            @RequestHeader(name="appKey",required = true) String appKey,
+            @RequestHeader(name="product",required = true) String product,
+            @RequestHeader(name="token",required = true) String token,
+            @RequestParam(value = "taskId") String taskId);
+
+
+    /***
+     *
+     * 查询当前流程对应的可执行任务，无权限级别
+     * */
+
+    @RequestMapping(value = "/task/getTaskNoAuth/{processInstanceId}", method = RequestMethod.GET)
+    JSONObject getTaskNoAuthtoken(
+            @RequestHeader(name="appKey",required = true) String appKey,
+            @RequestHeader(name="product",required = true) String product,
+            @RequestHeader(name="token",required = true) String token,
+            @PathVariable(value = "processInstanceId") String processInstanceId);
+
+
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/pom.xml

@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-feign-workflow</artifactId>
-            <version>1.8.5</version>
+            <version>1.10.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
+import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeginService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
@@ -96,7 +98,8 @@ public class JgUseRegistrationController extends BaseController {
         return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(id));
     }
 
-
+@Autowired
+    WorkFlowFeginService workFlowFeginService;
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/test")
     @ApiOperation(httpMethod = "GET", value = "", notes = "")
@@ -105,11 +108,8 @@ public class JgUseRegistrationController extends BaseController {
         //启动流程
         try {
             ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-            dto.setProcessDefinitionKey("useRegistrationNew");
+            dto.setProcessDefinitionKey("useRegistration");
             dto.setBusinessKey("1");
-            HashMap<String, Object> dtoMap = new HashMap<>();
-            dtoMap.put("approvalStatus", op);
-            dto.setVariables(dtoMap);
             AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
             instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
 
@@ -130,12 +130,19 @@ public class JgUseRegistrationController extends BaseController {
             AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
             JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
             String taskId = dataObject.getString("id");
+//            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
+//            FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(taskId);
+
             //组装信息
             TaskResultDTO dto = new TaskResultDTO();
-            dto.setResult(op);
+//            dto.setResult(op);
             dto.setResultCode("approvalStatus");
             dto.setTaskId(taskId);
             dto.setComment("啦啦啦啦！！！！！");
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("approvalStatus", op);
+            dto.setVariable(map);
+//            FeignClientResult reject = Workflow.taskV2Client.reject(taskId, dto);
             //执行流程
             AjaxResult ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -12,17 +12,25 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgRelationEquipMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
+import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeginService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.workflow.Workflow;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.AjaxResult;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -43,7 +51,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private OtherInfoMapper otherInfoMapper;
     @Autowired
     private JgRelationEquipMapper jgRelationEquipMapper;
-
+    @Autowired
+    WorkFlowFeginService workFlowFeginService;
     public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page) {
         return this.baseMapper.getListPage(page, dto);
     }
@@ -74,6 +83,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setSupervisoryCode(supervisoryCode);
         jgUseRegistration.setUseUnitName(useInfo.getUseUnitName());
         jgUseRegistration.setUseUnitCreditCode(useInfo.getUseUnitCreditCode());
+        jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
+        jgUseRegistration.setInspectUnitName(map.get("inspectOrgName").toString());
 //        jgUseRegistration.setAuditStatus();
 //        jgUseRegistration.setUseRegistrationCode();
 
@@ -84,6 +95,58 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgRelationEquip.setEquipId(map.get("equipId").toString());
         jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode()));
         jgRelationEquipMapper.insert(jgRelationEquip);
+        if (!ObjectUtils.isEmpty(map.get("submit"))){
+            // 启动并执行流程
+            String instanceId = startByVariable();
+            if (ObjectUtils.isEmpty(instanceId)){
+                // 执行流程
+                flowExecute(instanceId, "1", "备注"+System.currentTimeMillis());
+            }
+            jgUseRegistration.setInstanceId(instanceId);
+            this.update();
+        }
+    }
+
+    public String   startByVariable (){
+        String instanceId = "";
+        //启动流程
+        try {
+            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+            dto.setProcessDefinitionKey("useRegistrationNew");
+            dto.setBusinessKey("submit");
+            AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
+            instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return instanceId;
+    }
+
+    public void flowExecute(String instanceId, String operate, String comment){
+        try {
+            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+            JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+            String taskId = dataObject.getString("id");
+            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
+            FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(taskId);
+            //组装信息
+            TaskResultDTO dto = new TaskResultDTO();
+            dto.setResultCode("approvalStatus");
+            dto.setTaskId(taskId);
+            dto.setComment(comment+System.currentTimeMillis());
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("approvalStatus", operate);
+            dto.setVariable(map);
+            //执行流程
+            AjaxResult ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
+
+            if (ObjectUtils.isEmpty(ajaxResult1)) {
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public void deleteBatch(List<Long> ids) {