Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/MetaGameProcess.java

@@ -32,6 +32,10 @@ public class MetaGameProcess extends BaseEntity {
     @ExcelProperty("是否完成")
     private boolean completed;
 
+    @ExcelProperty("是否强制退出")
+    @ApiModelProperty("是否强制退出")
+    private boolean forceQuit;
+
     @ApiModelProperty("玩家id")
     @ExcelProperty("玩家id")
     private Long userId;

src/main/java/com/izouma/nineth/service/MetaUserGoldService.java

@@ -1,20 +1,92 @@
 package com.izouma.nineth.service;
 
 import com.izouma.nineth.domain.MetaUserGold;
+import com.izouma.nineth.domain.MetaUserGoldRecord;
+import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MetaUserGoldRecordRepo;
 import com.izouma.nineth.repo.MetaUserGoldRepo;
+import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
+import java.util.*;
+
 @Service
 @AllArgsConstructor
+@Slf4j
 public class MetaUserGoldService {
 
     private MetaUserGoldRepo metaUserGoldRepo;
 
+    private MetaUserGoldRecordRepo metaUserGoldRecordRepo;
+
+    private UserRepo userRepo;
+
     public Page<MetaUserGold> all(PageQuery pageQuery) {
         return metaUserGoldRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaUserGold.class), JpaUtils.toPageRequest(pageQuery));
     }
+
+    @Transactional
+    public void initMetaUserGold(String userIds) {
+        String[] split = userIds.split(" ");
+        List<MetaUserGold> metaUserGolds = new ArrayList<>();
+        List<MetaUserGoldRecord> metaUserGoldRecords = new ArrayList<>();
+        Arrays.stream(split).forEach(userId -> {
+            metaUserGolds.add(new MetaUserGold(Long.parseLong(userId), 0));
+            metaUserGoldRecords.add(new MetaUserGoldRecord(Long.parseLong(userId), 0, 0, 0));
+        });
+        metaUserGoldRepo.saveAll(metaUserGolds);
+        metaUserGoldRecordRepo.saveAll(metaUserGoldRecords);
+
+    }
+
+    public void checkUserId(String userIds) {
+        String[] split = userIds.split(" ");
+        Set<Long> set = new HashSet<>();
+        Arrays.stream(split).forEach(userId -> {
+            userRepo.findById(Long.parseLong(userId)).orElseThrow(new BusinessException(String.format("不存在id[%S]的用户", userId)));
+            set.add(Long.parseLong(userId));
+        });
+        if (set.size() != split.length) {
+            throw new BusinessException("存在重复用户id，请检查！");
+        }
+        List<MetaUserGold> metaUserGolds = metaUserGoldRepo.findAllByUserIdInAndDel(set, false);
+        if (CollectionUtils.isNotEmpty(metaUserGolds)) {
+            StringBuffer str = new StringBuffer();
+            metaUserGolds.forEach(metaUserGold -> {
+                str.append(metaUserGold.getUserId()).append(",");
+            });
+            throw new BusinessException(String.format("已经存在[%S]的数据", str.subSequence(0, str.length())));
+        }
+    }
+
+    @Transactional
+    public MetaRestResult<MetaUserGold> changeNum(Long userId, int num) {
+        MetaUserGold metaUserGold = metaUserGoldRepo.findByUserIdAndDel(userId, false);
+        if (Objects.isNull(metaUserGold)) {
+            log.info(String.format("不存在用户[%S]记录。默认初始化", userId));
+            initMetaUserGold(String.valueOf(userId));
+            metaUserGold = metaUserGoldRepo.findByUserIdAndDel(userId, false);
+        }
+        // 操作前金币数量
+        int nowNum = metaUserGold.getNum();
+        MetaUserGoldRecord metaUserGoldRecord = new MetaUserGoldRecord();
+        metaUserGoldRecord.setUserId(userId);
+        metaUserGoldRecord.setBeforeNum(nowNum);
+        metaUserGoldRecord.setAfterNum(nowNum + num);
+        metaUserGoldRecord.setOperationNum(num);
+        metaUserGold.setNum(nowNum + num);
+        if (metaUserGoldRecord.getAfterNum() < 0) {
+            return MetaRestResult.returnError(String.format("用户[%S] 当前金币剩余[%S] 本次操作需要金币数量为[%S]", userId, nowNum, -num));
+        }
+        metaUserGoldRecordRepo.save(metaUserGoldRecord);
+        return MetaRestResult.returnSuccess(metaUserGoldRepo.save(metaUserGold));
+    }
 }

src/main/java/com/izouma/nineth/web/MetaUserGoldController.java

@@ -1,37 +1,32 @@
 package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.MetaUserGold;
-import com.izouma.nineth.domain.MetaUserGoldRecord;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.MetaUserGoldRecordRepo;
 import com.izouma.nineth.repo.MetaUserGoldRepo;
-import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.service.MetaUserGoldService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
 
 @RestController
 @RequestMapping("/metaUserGold")
 @AllArgsConstructor
+@Slf4j
 public class MetaUserGoldController extends BaseController {
     private MetaUserGoldService metaUserGoldService;
 
     private MetaUserGoldRepo metaUserGoldRepo;
 
-    private MetaUserGoldRecordRepo metaUserGoldRecordRepo;
-
-    private UserRepo userRepo;
-
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public MetaUserGold save(@RequestBody MetaUserGold record) {
@@ -69,23 +64,7 @@ public class MetaUserGoldController extends BaseController {
 
     @PostMapping("/changeNum")
     public MetaRestResult<MetaUserGold> changeNum(Long userId, int num) {
-        MetaUserGold metaUserGold = metaUserGoldRepo.findByUserIdAndDel(userId, false);
-        if (Objects.isNull(metaUserGold)) {
-            return MetaRestResult.returnError(String.format("不存在用户[%S]记录", userId));
-        }
-        // 操作前金币数量
-        int nowNum = metaUserGold.getNum();
-        MetaUserGoldRecord metaUserGoldRecord = new MetaUserGoldRecord();
-        metaUserGoldRecord.setUserId(userId);
-        metaUserGoldRecord.setBeforeNum(nowNum);
-        metaUserGoldRecord.setAfterNum(nowNum + num);
-        metaUserGoldRecord.setOperationNum(num);
-        metaUserGold.setNum(nowNum + num);
-        if (metaUserGoldRecord.getAfterNum() < 0) {
-            return MetaRestResult.returnError(String.format("用户[%S] 当前金币剩余[%S] 本次操作需要金币数量为[%S]", userId, nowNum, -num));
-        }
-        metaUserGoldRecordRepo.save(metaUserGoldRecord);
-        return MetaRestResult.returnSuccess(metaUserGoldRepo.save(metaUserGold));
+        return metaUserGoldService.changeNum(userId, num);
     }
 
     @GetMapping("/{userId}/queryNum")
@@ -98,37 +77,13 @@ public class MetaUserGoldController extends BaseController {
     }
 
     @GetMapping("/{userIds}/check")
-    private void checkUserId(@PathVariable String userIds) {
-        String[] split = userIds.split(" ");
-        Set<Long> set = new HashSet<>();
-        Arrays.stream(split).forEach(userId -> {
-            userRepo.findById(Long.parseLong(userId)).orElseThrow(new BusinessException(String.format("不存在id[%S]的用户", userId)));
-            set.add(Long.parseLong(userId));
-        });
-        if(set.size() != split.length) {
-            throw new BusinessException("存在重复用户id，请检查！");
-        }
-        List<MetaUserGold> metaUserGolds = metaUserGoldRepo.findAllByUserIdInAndDel(set, false);
-        if (CollectionUtils.isNotEmpty(metaUserGolds)) {
-            StringBuffer str = new StringBuffer();
-            metaUserGolds.forEach(metaUserGold -> {
-                str.append(metaUserGold.getUserId()).append(",");
-            });
-            throw new BusinessException(String.format("已经存在[%S]的数据", str.subSequence(0, str.length())));
-        }
+    public void checkUserId(@PathVariable String userIds) {
+        metaUserGoldService.checkUserId(userIds);
     }
-    @PostMapping("/{userIds}/init")
-    private void initMetaUserGold(@PathVariable String userIds) {
-        String[] split = userIds.split(" ");
-        List<MetaUserGold> metaUserGolds = new ArrayList<>();
-        List<MetaUserGoldRecord> metaUserGoldRecords = new ArrayList<>();
-        Arrays.stream(split).forEach(userId -> {
-            metaUserGolds.add(new MetaUserGold(Long.parseLong(userId), 0));
-            metaUserGoldRecords.add(new MetaUserGoldRecord(Long.parseLong(userId), 0, 0, 0));
-        });
-        metaUserGoldRepo.saveAll(metaUserGolds);
-        metaUserGoldRecordRepo.saveAll(metaUserGoldRecords);
 
+    @PostMapping("/{userIds}/init")
+    public void initMetaUserGold(@PathVariable String userIds) {
+        metaUserGoldService.initMetaUserGold(userIds);
     }
 }
 

src/main/vue/src/views/MetaGameProcessList.vue

@@ -56,6 +56,11 @@
                 <template slot-scope="{ row }">
                     <el-tag :type="row.disconnected ? '' : 'info'"> {{ row.disconnected }} </el-tag>
                 </template>
+            </el-table-column>
+			<el-table-column prop="forceQuit" align="center" label="是否强制退出">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.forceQuit ? '' : 'info'"> {{ row.forceQuit }} </el-tag>
+                </template>
             </el-table-column>
             <el-table-column prop="completed" align="center" label="是否完成">
                 <template slot-scope="{ row }">