修改tzs、ugp问题

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/TzCylinderFillingDto.java

@@ -117,6 +117,6 @@ public class TzCylinderFillingDto {
      */
     private String inspectorAfter;
 
-
+    private String fillingDate;
 
 }

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

@@ -132,6 +132,9 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Override
 	public TzBaseEnterpriseInfoDto selectByUseUnit(String useUnit) {
+		if(ValidationUtil.isEmpty(useUnit)){
+			return new TzBaseEnterpriseInfoDto();
+		}
 		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
 		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnit(useUnit);
 		if (tzBaseEnterpriseInfo != null) {

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

@@ -126,6 +126,15 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 			tzCylinderFillingDto.setTzCylinderAfterCheckDtoList(tzCylinderAfterCheckDtoListResult);
 		}
 
+		if(!ValidationUtil.isEmpty(tzCylinderFillingDtoList)){
+			String fillingEndTime = tzCylinderFillingDtoList.iterator().next().getFillingEndtime();
+			if(!ValidationUtil.isEmpty(fillingEndTime)) {
+				if(fillingEndTime.length()>10) {
+					tzCylinderFillingDtoList.iterator().next().setFillingDate(fillingEndTime.substring(0,10));
+				}
+			}
+		}
+
 		return new TzCylinderTraceDto(tzCylinderProduceDto, tzCylinderInfoDto, tzCylinderTagsDto,
 				tzCylinderInspectionDtoList, tzCylinderFillingDtoList);
 	}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/ProjectMapper.xml

@@ -19,13 +19,13 @@
     </select>
 
     <select id="queryProjectPage"  resultType="com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto">
-        select
+        SELECT
         pt.*,
-        pg.context  AS context
-        from tz_ugp_project pt
-        left join
-        tz_ugp_project_initiation_log pg
-        on pt.instance_id=pg.instance_id
+        pg.context AS context
+        FROM
+        tz_ugp_project pt
+        LEFT JOIN (	SELECT * FROM tz_ugp_project_initiation_log GROUP BY
+        instance_id ) pg ON pt.instance_id = pg.instance_id
         <where>
             <if test="roleName == '建设单位'">
                 and pt.construction_unit_id = #{companyId}
@@ -51,7 +51,6 @@
                 and pt.`construction_Unit` like concat('%',#{project.constructionUnit},'%')
             </if>
         </where>
-        GROUP BY pg.instance_id
         order by pt.rec_date desc
     </select>
 

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
@@ -37,10 +38,14 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.springframework.web.servlet.support.RequestDataValueProcessor;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.crypto.spec.RC2ParameterSpec;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -85,6 +90,7 @@ public class ProjectController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "新增项目信息表", notes = "新增项目信息表")
 	@BusinessIdentify
 	public ResponseModel<ProjectDto> save(@RequestBody ProjectDto model) {
+		System.out.println("项目立项开始："+ DateUtils.date2LongStr(new Date()));
 		String regionName = "",regionCode = "";
 		Map<String,String> map = getInfo(regionName,regionCode,Long.valueOf(model.getInstallRegionCode()));
 		model.setSubmitDate(new Date());
@@ -98,7 +104,21 @@ public class ProjectController extends BaseController {
 		model = projectServiceImpl.createWithModel(model);
 		Project project = new Project();
 		BeanUtils.copyProperties(model, project);
-		projectInitiationService.start(project);
+		System.out.println("项目立项保存信息结束："+DateUtils.date2LongStr(new Date()));
+		String token = RequestContext.getToken();
+		String appKey = RequestContext.getAppKey();
+		String product = RequestContext.getProduct();
+		//分支线程执行流程
+		Thread t1 = new Thread(new Runnable() {
+			@Override
+			public void run() {
+				RequestContext.setToken(token);
+				RequestContext.setAppKey(appKey);
+				RequestContext.setProduct(product);
+				projectInitiationService.start(project);
+			}
+		});
+		t1.start();
 		return ResponseHelper.buildResponse(model);
 	}
 	// 静态变量存储最大值

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java

@@ -86,6 +86,11 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
 
     private void getProjectState(ProjectDto project) {
         String state = "",insDep = "",insPerson = "",insDepId = "";
+        //新立项的项目 分支流程原因还没有instanceId 默认给值
+        if(ValidationUtil.isEmpty(project.getInstanceId())){
+            state=ProjectInitiationEnum.平台审核.getTaskDetailStatus();
+        }
+
         LambdaQueryWrapper<ProjectInitiation> lambdaQueryWrap = new LambdaQueryWrapper<>();
         lambdaQueryWrap.eq(ProjectInitiation::getInstanceId,project.getInstanceId())
 //                .eq(ProjectInitiation ::getTaskName, ProjectInitiationEnum.平台审核.getName())

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java

@@ -348,7 +348,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
             verify.setCode(jsonObject.getString("code"));
             //从图片中获取管材编号materialId
            //管材编号(暂时写死)
-            String url = "http://172.16.10.220:9000/"+photo;
+            String url = photo;
             String materialCode = getMaterialCodeByOcr(url);
             verify.setStage(StageEnum.焊前管材质量.getStage());
             /**校验*/

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application.properties

@@ -42,4 +42,9 @@ monitoringRoleId=1585099377079250946
 constructionRoleId=1585099241989107713
 
 #??????????????
-mqtt.topic.weldUpdate = /ugp/weldUpdate
\ No newline at end of file
+mqtt.topic.weldUpdate = /ugp/weldUpdate
+
+# default context ??????
+feign.client.config.default.connectTimeout = 10000
+# default context ?????
+feign.client.config.default.readTimeout = 60000
\ No newline at end of file