Merge remote-tracking branch 'origin/master'

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/feign/SafeInnerDangerClient.java

@@ -0,0 +1,25 @@
+package com.hnac.hzims.safeproduct.feign;
+
+
+import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
+import com.hnac.hzims.safeproduct.flow.service.IInnerDangerFlowService;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@AllArgsConstructor
+public class SafeInnerDangerClient implements ISafeInnerDangerClient {
+
+	private IInnerDangerFlowService service;
+
+
+	@PostMapping(SAVE_HIDDENDANGER)
+	@Override
+	public R saveDefect(@RequestBody ProcessWorkFlowResponse processWorkFlowResponse) {
+		return service.listenAndUpdateDefect(processWorkFlowResponse);
+	}
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java

@@ -28,10 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -141,7 +138,7 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
      */
     @Override
     public void exportTrainRecordData(Long id, HttpServletResponse response) {
-        TrainRecordDetailVO trainRecordDetailVO = this.getTrainRecordDetailById(id);
+        TrainRecordDetailVO trainRecordDetailVO = this.baseMapper.getTrainRecordDetailById(id);
         // 数据处理
         // 培训方式
         String trainMethod = trainRecordDetailVO.getTrainMethod();
@@ -153,19 +150,14 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
             trainRecordDetailVO.setTrainMethod(TrainMethodEnum.OFFLINE.getDesc());
         }
         // 图片
-        List<ImageEntity> list = new ArrayList<>();
         if (StringUtils.isNotEmpty(trainRecordDetailVO.getImgPath())) {
-            String[] imgArr = trainRecordDetailVO.getImgPath().split(",");
+            trainRecordDetailVO.setImages(Arrays.stream(trainRecordDetailVO.getImgPath().split(",")).map(img->
-            for (String img : imgArr) {
+                    new ImageEntity(BaseUtil.imgToByte(savePath + BaseUtil.downloadFileByUrl(img, savePath)), 180, 150)
-                ImageEntity imageEntity = new ImageEntity(BaseUtil.imgToByte(savePath +
+            ).collect(Collectors.toList()));
-                        BaseUtil.downloadFileByUrl(img, savePath)), 180, 150);
-                list.add(imageEntity);
-            }
         } else {
             // 添加空的ImageEntity，防止数据填入时显示"{{"
-            list.add(new ImageEntity());
+            trainRecordDetailVO.setImages(Collections.singletonList(new ImageEntity()));
         }
-        trainRecordDetailVO.setImages(list);
         // 表头年月
         String code = trainRecordDetailVO.getCode();
         trainRecordDetailVO.setYear(code.substring(4, 8));