Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProblemCodeLibController.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProblemCodeLibDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProblemCodeLib;
 import com.yeejoin.amos.boot.module.ugp.api.service.IProblemCodeLibService;
@@ -16,18 +18,26 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.ApplicationModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import feign.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.IOUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -48,6 +58,13 @@ public class ProblemCodeLibController extends BaseController {
     @Resource
     private IProblemCodeLibService problemCodeLibService;
 
+
+    @Autowired
+    FailureDetailsServiceImpl failureDetailsServiceImpl;
+
+    @Autowired
+    WorkflowFeignService workflowFeignService;
+
     /**
      * 新增质量监检信息表
      */
@@ -172,4 +189,23 @@ public class ProblemCodeLibController extends BaseController {
         List<DictionarieValueModel> result = adminCommonlyUsed.getResult();
         return ResponseHelper.buildResponse(result);
     }
+
+    /**
+     * 参考JCS服务流程图信息
+     * @param instanceId 流程实例ID
+     * @return 流程图
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getInstanceImage")
+    @ApiOperation(httpMethod = "GET", value = "流程图高亮图片", notes = "流程图高亮图片")
+    public ResponseEntity<String> downloadFile(@RequestParam String instanceId, HttpServletRequest request, HttpServletResponse response) {
+        Response feignResponse = workflowFeignService.thighLineImg(instanceId);
+        try {
+            Response.Body body = feignResponse.body();
+            return new ResponseEntity<>(IOUtils.toString(body.asInputStream()),  HttpStatus.OK);
+        } catch (Exception e) {
+            throw new BaseException("Error exporting diagram", "500", instanceId);
+        }
+
+    }
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.swagger.models.Model;
-import org.springframework.beans.BeanUtils;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +31,7 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
+import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -249,7 +250,8 @@ public class ProjectController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "Post", value = "项目审核", notes = "项目审核")
 	@PostMapping(value = "/processProject")
-	public ResponseModel<String> processProject(@RequestParam("sequenceNbr") String sequenceNbr,String option,@RequestBody JSONObject json){
+	public ResponseModel<String> processProject(@RequestParam("sequenceNbr") String sequenceNbr,String option,@RequestBody JSONObject j){
+		JSONObject json = j.getJSONObject("fileInfo");
 		Project project = projectServiceImpl.getById(sequenceNbr);
 		JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(project));
 		jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核通过");
@@ -262,7 +264,6 @@ public class ProjectController extends BaseController {
 			jsonObject.put(XJConstant.INS_DEP,map.get("name"));
 			jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"监检员待审核");
 		} else if (!ValidationUtil.isEmpty(insDepId)) {
-
 			Map map = orgServiceImpl.getdetialInfo(insDepId);
 			jsonObject.put(XJConstant.INS_DEPID,map.get("sequenceNbr"));
 			jsonObject.put(XJConstant.INS_DEP,map.get("name"));
@@ -335,8 +336,17 @@ public class ProjectController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "通过sequenceNbr查询项目详情", notes = "通过sequenceNbr查询项目详情")
 	@GetMapping(value = "/getDetail")
-	public ResponseModel<ProjectDto> getDetail(Long sequenceNbr){
-		return ResponseHelper.buildResponse(projectServiceImpl.getDetail(sequenceNbr));
+	public ResponseModel<JSONObject> getDetail(Long sequenceNbr){
+		JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(projectServiceImpl.getInformationDetail(sequenceNbr)));
+		try {
+			jsonObject.putAll(BeanUtils.describe(projectServiceImpl.getDetail(sequenceNbr)));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		JSONObject jo = new JSONObject();
+		jo.put("projectInfo",projectServiceImpl.selectById(sequenceNbr));
+		jo.put("fileInfo",jsonObject);
+		return ResponseHelper.buildResponse(jo);
 	}