Bladeren bron

"签到签退"

yangjunfeng 1 maand geleden
bovenliggende
commit
4f0e4cf371

+ 6 - 4
tofly-zhongmou-gas/service/zmourq/src/main/java/com/tofly/zmrq/custom/service/impl/CustomTfPdaSignServiceImpl.java

@@ -111,10 +111,12 @@ public class CustomTfPdaSignServiceImpl implements CustomTfPdaSignService {
         } else {
             esPdaDeviceUpload.setWorkState(new BigDecimal(2));
         }
-        tfPdaSignService.save(addSign);
-        if(dyrqGpsService.save(esPdaDeviceUpload).getCode() != 1){
-            throw new ToflyDeniedException("es存储设备上传信息失败");
-        };
+        try {
+            tfPdaSignService.save(addSign);
+            if (dyrqGpsService.save(esPdaDeviceUpload).getCode() != 1) throw new ToflyDeniedException("es存储设备上传信息失败");
+        } catch (Exception e) {
+            throw new ToflyDeniedException("签到人数过多,服务器繁忙,请稍后再试");
+        }
         return true;
     }
 

+ 1 - 1
tofly-zhongmou-gas/service/zmourq/src/main/java/com/tofly/zmrq/entity/TfPdaSign.java

@@ -41,7 +41,7 @@ public class TfPdaSign extends Model<TfPdaSign> {
     /**
      * 主键id
      */
-    @TableId(value = "ID", type = IdType.INPUT)
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键id", hidden = true)
     private Long id;
     /**