Commit b7d96c0b authored by yangyang's avatar yangyang

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 96d98b50 774817c0
...@@ -100,9 +100,9 @@ public class JyjcInspectionApplicationEquipModel extends BaseModel { ...@@ -100,9 +100,9 @@ public class JyjcInspectionApplicationEquipModel extends BaseModel {
@ApiModelProperty(value = "型号") @ApiModelProperty(value = "型号")
private String equType; private String equType;
@ApiModelProperty(value = "制造单位名称") @ApiModelProperty(value = "制造单位名称")
private String productUnitName; private String produceUnitName;
@ApiModelProperty(value = "制造日期") @ApiModelProperty(value = "制造日期")
private String productDate; private String produceDate;
// @ApiModelProperty(value = "使用年限") // @ApiModelProperty(value = "使用年限")
// private String use; // private String use;
} }
package com.yeejoin.amos.boot.module.jyjc.biz.feign;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@FeignClient(contextId = "jyjc", name = "${tzsJg.feign.name:TZS-JG}", path = "jg", configuration = {MultipartSupportConfig.class})
public interface JgFeignClient {
/***
* 设备注册信息分页查询
*
* */
@RequestMapping(value = "/equipment-register/page", method = RequestMethod.GET)
FeignClientResult<Page<JSONObject>> queryForPage(@RequestParam Map<String,Object> map);
}
...@@ -14,12 +14,14 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.*; ...@@ -14,12 +14,14 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
import com.yeejoin.amos.boot.module.jyjc.api.enums.DocumentEnum; import com.yeejoin.amos.boot.module.jyjc.api.enums.DocumentEnum;
import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum; import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum; import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper; import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationAttachmentModel; import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationAttachmentModel;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel; import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel; import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService; import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException; import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
import com.yeejoin.amos.boot.module.jyjc.biz.feign.JgFeignClient;
import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspectionApplicationHandlerFactory; import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspectionApplicationHandlerFactory;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService; import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
...@@ -79,6 +81,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -79,6 +81,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
@Autowired @Autowired
WorkflowFeignService workflowFeignService; WorkflowFeignService workflowFeignService;
@Autowired
private JyjcInspectionApplicationEquipMapper jyjcInspectionApplicationEquipMapper;
@Autowired
JgFeignClient jgFeignClient;
public JyjcInspectionApplicationModel save(@RequestBody JyjcInspectionApplicationModel model) { public JyjcInspectionApplicationModel save(@RequestBody JyjcInspectionApplicationModel model) {
...@@ -281,6 +289,23 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -281,6 +289,23 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
List<AttachmentDto> data = JSONArray.parseArray(maps.get("attachment_url").toString(), AttachmentDto.class); List<AttachmentDto> data = JSONArray.parseArray(maps.get("attachment_url").toString(), AttachmentDto.class);
attMap.put(maps.get("attachment_type").toString(), data); attMap.put(maps.get("attachment_type").toString(), data);
} }
LambdaQueryWrapper<JyjcInspectionApplicationEquip> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(JyjcInspectionApplicationEquip::getApplicationSeq, sequenceNbr);
List<JyjcInspectionApplicationEquip> jyjcInspectionApplicationEquips = jyjcInspectionApplicationEquipMapper.selectList(wrapper);
String collect = jyjcInspectionApplicationEquips.stream().map(JyjcInspectionApplicationEquip::getEquipUnicode).distinct().collect(Collectors.joining(","));
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("number", 1);
hashMap.put("size", jyjcInspectionApplicationEquips.size());
hashMap.put("SUPERVISORY_CODE", collect);
FeignClientResult<Page<JSONObject>> response = jgFeignClient.queryForPage(hashMap);
if (200 == response.getStatus() && ObjectUtils.isNotEmpty(response.getResult())) {
List<JSONObject> records = response.getResult().getRecords();
records.forEach(item -> {
item.remove("SEQUENCE_NBR");
});
List<JyjcInspectionApplicationEquipModel> equips = JSON.parseArray(JSON.toJSONString(records), JyjcInspectionApplicationEquipModel.class);
map.put("equip", equips);
}
map.putAll(attMap); map.putAll(attMap);
return map; return map;
} }
......
...@@ -48,4 +48,7 @@ elasticsearch.username= elastic ...@@ -48,4 +48,7 @@ elasticsearch.username= elastic
elasticsearch.password= a123456 elasticsearch.password= a123456
#检验检测流程KEY #检验检测流程KEY
process-definition-key.jyjc.openapplication=inspectionBusinessOpened process-definition-key.jyjc.openapplication=inspectionBusinessOpened
\ No newline at end of file
# 监管端feign调用服务
tzsJg.feign.name=TZS-JG
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment