Redeem 2 日 前
コミット
54c1c566c1

+ 11 - 3
src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -52,6 +52,7 @@ import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -86,6 +87,7 @@ import java.util.stream.Collectors;
  * @see null
  */
 @Service(value = "meterWorkRailwayActFirstService")
+@Slf4j
 public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWorkRailwayActFirst, String> implements IMeterWorkRailwayActFirstService {
 
     @Resource
@@ -150,20 +152,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Transactional(rollbackFor = Exception.class)
     public RESTfulResult checkandadd(MeterWorkRailwayActFirst model) {
         RESTfulResult rm = new RESTfulResult();
+        log.info("请求到达, predictionNo={}, trainNo={}, time={}",
+                model.getPredictionNo(), model.getRailwayNo(), model.getCreateTime());
         rm.setFailed();
         try {
             List<MeterWorkRailwayActFirst> firsts = new ArrayList<>();
             HashMap<String, Object> map = new HashMap<>();
-
             check1(model);
             model.setDataSource("1");
 //            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 //            String no = meterWorkRailwayActFirstMapper.getNewID(sdf.format(new Date()));
 //            model.setActualFirstNo(sdf.format(new Date()) + no);
             String no = PublicMethod.IdCreate(3);
+            log.info("生成单号: {}", no);
             model.setActualFirstNo(no);
             model.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(model);
+            log.info("插入记录成功, 主键={}", model.getId());
             if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())) {
                 MeterWorkRailwayActFirst modelTemp = meterWorkRailwayActFirstMapper.selectAndMatch(model.getActualFirstNo(), model.getPredictionNo());
                 BeanUtils.copyProperties(modelTemp, model);
@@ -191,8 +196,11 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             rm.setMessage("操作成功!!");
             rm.setData(map);
         } catch (Exception e) {
-            e.printStackTrace();
-            rm.setMessage("操作异常,请确认!!>>>" + e.getMessage());
+            log.error("操作异常,actualFirstNo={}, predictionNo={}",
+                    model.getActualFirstNo(), model.getPredictionNo(), e);
+            rm.setMessage("操作异常,请稍后重试");
+            // 必须抛出去让事务回滚
+            throw new RuntimeException(e);
         }
         return rm;
     }

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -46,4 +46,4 @@ management:
         include: '*'
 meter:
   sync:
-    enabled: true
+    enabled: false