1.修改类型为string

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/HiddenDanger.java

@@ -53,7 +53,7 @@ public class HiddenDanger extends BasicEntity {
      * 隐患类型（1-防火监督检查；2-自行检查）
      */
     @Column(name = "danger_type")
-    private Long dangerType;
+    private String dangerType;
 
     /**
      * 隐患类型名称

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/HiddenDangerController.java

@@ -73,8 +73,8 @@ public class HiddenDangerController extends AbstractBaseController {
     @ApiOperation(value = "导入隐患", notes = "导入隐患")
     @RequestMapping(value = "/import", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public ResponseModel importDanger(
-            @RequestParam(value = "planId") String planId,
-            @RequestParam(value = "pointId") String pointId,
+            @RequestParam(value = "planId") Long planId,
+            @RequestParam(value = "pointId") Long pointId,
             @ApiParam(value = "导入数据文件", required = true) @RequestBody MultipartFile file) {
         String fileName = file.getOriginalFilename();
         assert fileName != null;

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

 package com.yeejoin.amos.supervision.business.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
@@ -13,9 +14,11 @@ import com.yeejoin.amos.supervision.business.feign.DangerFeignClient;
 import com.yeejoin.amos.supervision.business.service.intfc.IHiddenDangerService;
 import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
 import com.yeejoin.amos.supervision.dao.entity.HiddenDanger;
+import liquibase.pro.packaged.D;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
@@ -42,6 +45,9 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
     @Value("${spring.application.name}")
     private String applicationName;
 
+    @Autowired
+    Sequence sequence;
+
     @Override
     public List<HiddenDangerExportDto> listAll(String planId, Long pointId, String level, String status) {
         return null;
@@ -80,13 +86,32 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
     }
 
     @Override
-    public void importDanger(String planId, String pointId, List<HiddenDangerImportDto> list) {
+    public void importDanger(Long planId, Long pointId, List<HiddenDangerImportDto> list) {
+        //1.调用创建隐患
         List<DangerDto> dtoList = list.stream().map(s -> {
             DangerDto dangerDto = new DangerDto();
             Bean.copyExistPropertis(s, dangerDto);
             dangerDto.setBizType(applicationName);
+            dangerDto.setBizId(sequence.nextId());
+            //自行检查
+            dangerDto.setCheckMode("1");
             return dangerDto;
         }).collect(Collectors.toList());
-
+        FeignClientResult<List<DangerDto>> feignClientResult = feignClient.saveOrUpdateBatch(dtoList);
+        List<DangerDto> dangerDbs = feignClientResult.getResult();
+        //2.保存隐患关系表
+        List<HiddenDanger> hiddenDangers = dangerDbs.stream().map(d->{
+            HiddenDanger hiddenDanger = new HiddenDanger();
+            hiddenDanger.setCreateBy(RequestContext.getExeUserId());
+            hiddenDanger.setPlanId(planId);
+            hiddenDanger.setPointId(pointId);
+            hiddenDanger.setLatentDangerId(d.getId());
+            hiddenDanger.setCheckInputId(d.getBizId());
+            hiddenDanger.setDangerType("1");
+            hiddenDanger.setDangerTypeName("自行检查");
+            hiddenDanger.setCreateDate(new Date());
+            return hiddenDanger;
+        }).collect(Collectors.toList());
+        iHiddenDangerDao.saveAll(hiddenDangers);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IHiddenDangerService.java

@@ -59,5 +59,5 @@ public interface IHiddenDangerService {
      * @param pointId 点id
      * @param list    数据
      */
-    void importDanger(String planId, String pointId, List<HiddenDangerImportDto> list);
+    void importDanger(Long planId, Long pointId, List<HiddenDangerImportDto> list);
 }