1.添加后台

2.修改命名为dawa
3.修改工作接口

pom.xml

@@ -9,9 +9,9 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.td</groupId>
-    <artifactId>WaDa</artifactId>
+    <artifactId>Dawa</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>WaDa</name>
+    <name>Dawa</name>
     <description>Demo project for Spring Boot</description>
     <properties>
         <java.version>1.8</java.version>

src/main/java/com/td/WaDa/BossApplication.java → src/main/java/com/td/Dawa/BossApplication.java

@@ -1,17 +1,17 @@
-package com.td.WaDa;
-
-import com.td.WaDa.common.service.ComConfigService;
-import com.td.WaDa.game.comusers.service.ComUsersService;
-import com.td.WaDa.sys.sysmenu.vo.SysMenuVo;
-import com.td.WaDa.sys.syssetting.service.SysSettingService;
-import com.td.WaDa.sys.syssettinglimit.service.SysSettingLimitService;
-import com.td.WaDa.sys.syssettingtask.service.SysSettingTaskService;
-import com.td.WaDa.sys.sysshortcutmenu.service.SysShortcutMenuService;
-import com.td.WaDa.sys.sysshortcutmenu.vo.SysShortcutMenuVo;
-import com.td.WaDa.sys.sysuser.service.SysUserService;
-import com.td.WaDa.sys.sysuser.vo.SysUserVo;
-import com.td.WaDa.sys.sysusermenu.service.SysUserMenuService;
-import com.td.WaDa.util.*;
+package com.td.Dawa;
+
+import com.td.Dawa.common.service.ComConfigService;
+import com.td.Dawa.game.comusers.service.ComUsersService;
+import com.td.Dawa.sys.sysmenu.vo.SysMenuVo;
+import com.td.Dawa.sys.syssetting.service.SysSettingService;
+import com.td.Dawa.sys.syssettinglimit.service.SysSettingLimitService;
+import com.td.Dawa.sys.syssettingtask.service.SysSettingTaskService;
+import com.td.Dawa.sys.sysshortcutmenu.service.SysShortcutMenuService;
+import com.td.Dawa.sys.sysshortcutmenu.vo.SysShortcutMenuVo;
+import com.td.Dawa.sys.sysuser.service.SysUserService;
+import com.td.Dawa.sys.sysuser.vo.SysUserVo;
+import com.td.Dawa.sys.sysusermenu.service.SysUserMenuService;
+import com.td.Dawa.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/td/WaDa/annotation/Between.java → src/main/java/com/td/Dawa/annotation/Between.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.annotation;
+package com.td.Dawa.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/td/WaDa/annotation/Decrypt.java → src/main/java/com/td/Dawa/annotation/Decrypt.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.annotation;
+package com.td.Dawa.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/td/WaDa/annotation/Encrypt.java → src/main/java/com/td/Dawa/annotation/Encrypt.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.annotation;
+package com.td.Dawa.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/td/WaDa/annotation/In.java → src/main/java/com/td/Dawa/annotation/In.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.annotation;
+package com.td.Dawa.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/td/WaDa/annotation/Like.java → src/main/java/com/td/Dawa/annotation/Like.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.annotation;
+package com.td.Dawa.annotation;
 
 
 import java.lang.annotation.ElementType;

src/main/java/com/td/WaDa/aspect/SafetyAspect.java → src/main/java/com/td/Dawa/aspect/SafetyAspect.java

@@ -1,12 +1,11 @@
-package com.td.WaDa.aspect;
+package com.td.Dawa.aspect;
 
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
-import com.td.WaDa.annotation.Decrypt;
-import com.td.WaDa.annotation.Encrypt;
-import com.td.WaDa.common.pojo.ParameterRequestWrapper;
-import com.td.WaDa.common.pojo.Result;
-import com.td.WaDa.util.*;
+import com.td.Dawa.annotation.Decrypt;
+import com.td.Dawa.annotation.Encrypt;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.util.*;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
-import java.util.HashMap;
 
 /**
  * AES + RSA 加解密AOP处理
@@ -50,9 +48,9 @@ public class SafetyAspect {
     /**
      * Pointcut 切入点
      */
-    @Pointcut(value = "execution(public * com.td.WaDa.sys.*.controller.*.*(..)) || " +
-            "execution(public * com.td.WaDa.*.controller.*.*(..))||" +
-            "execution(public * com.td.WaDa.game.*.controller.*.*(..))")
+    @Pointcut(value = "execution(public * com.td.Dawa.sys.*.controller.*.*(..)) || " +
+            "execution(public * com.td.Dawa.*.controller.*.*(..))||" +
+            "execution(public * com.td.Dawa.game.*.controller.*.*(..))")
     public void safetyAspect() {
     }
 

src/main/java/com/td/WaDa/common/controller/CommonController.java → src/main/java/com/td/Dawa/common/controller/CommonController.java

@@ -1,10 +1,10 @@
-package com.td.WaDa.common.controller;
+package com.td.Dawa.common.controller;
 
-import com.td.WaDa.annotation.Decrypt;
-import com.td.WaDa.annotation.Encrypt;
-import com.td.WaDa.common.pojo.PageInfo;
-import com.td.WaDa.common.pojo.Result;
-import com.td.WaDa.common.service.CommonService;
+import com.td.Dawa.annotation.Decrypt;
+import com.td.Dawa.annotation.Encrypt;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.common.service.CommonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/td/WaDa/common/pojo/ComConfig.java → src/main/java/com/td/Dawa/common/pojo/ComConfig.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.common.pojo;
+package com.td.Dawa.common.pojo;
 
 import lombok.Data;
 

src/main/java/com/td/WaDa/common/pojo/CultivateKeys.java → src/main/java/com/td/Dawa/common/pojo/CultivateKeys.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.common.pojo;
+package com.td.Dawa.common.pojo;
 
 /**
  * 牧场养殖渔场需求

src/main/java/com/td/WaDa/common/pojo/IpVo.java → src/main/java/com/td/Dawa/common/pojo/IpVo.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.common.pojo;
+package com.td.Dawa.common.pojo;
 
 import lombok.Data;
 

src/main/java/com/td/WaDa/common/pojo/MonitorVo.java → src/main/java/com/td/Dawa/common/pojo/MonitorVo.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.common.pojo;
+package com.td.Dawa.common.pojo;
 
 import lombok.Data;
 

src/main/java/com/td/WaDa/common/pojo/PageCondition.java → src/main/java/com/td/Dawa/common/pojo/PageCondition.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.common.pojo;
+package com.td.Dawa.common.pojo;
 
 import lombok.Data;
 import org.springframework.data.domain.PageRequest;

src/main/java/com/td/WaDa/common/pojo/PageInfo.java → src/main/java/com/td/Dawa/common/pojo/PageInfo.java

@@ -1,6 +1,6 @@
-package com.td.WaDa.common.pojo;
+package com.td.Dawa.common.pojo;
 
-import com.td.WaDa.util.CopyUtil;
+import com.td.Dawa.util.CopyUtil;
 import lombok.Data;
 import org.hibernate.query.internal.NativeQueryImpl;
 import org.springframework.data.domain.Page;

src/main/java/com/td/WaDa/common/pojo/ParameterRequestWrapper.java → src/main/java/com/td/Dawa/common/pojo/ParameterRequestWrapper.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.common.pojo;
+package com.td.Dawa.common.pojo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;

src/main/java/com/td/WaDa/common/pojo/Result.java → src/main/java/com/td/Dawa/common/pojo/Result.java

@@ -1,5 +1,6 @@
-package com.td.WaDa.common.pojo;
+package com.td.Dawa.common.pojo;
 
+import com.td.Dawa.config.enums.ResultEnum;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -45,6 +46,10 @@ public class Result<T> implements Serializable {
     public static <T> Result<T> of(T data, boolean flag, String msg,Integer code) {
         return new Result<>(data, flag, msg,code);
     }
+
+    public static <T> Result<T> of(T data, boolean flag, ResultEnum resultEnum) {
+        return new Result<>(data, flag, resultEnum.getMessage(),resultEnum.getCode());
+    }
     @Deprecated
     public Result() {
 

src/main/java/com/td/WaDa/common/repository/ComConfigRepository.java → src/main/java/com/td/Dawa/common/repository/ComConfigRepository.java

@@ -1,6 +1,6 @@
-package com.td.WaDa.common.repository;
+package com.td.Dawa.common.repository;
 
-import com.td.WaDa.common.pojo.ComConfig;
+import com.td.Dawa.common.pojo.ComConfig;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/td/WaDa/common/repository/CommonRepository.java → src/main/java/com/td/Dawa/common/repository/CommonRepository.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.common.repository;
+package com.td.Dawa.common.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/td/WaDa/common/service/ComConfigService.java → src/main/java/com/td/Dawa/common/service/ComConfigService.java

@@ -1,7 +1,7 @@
-package com.td.WaDa.common.service;
+package com.td.Dawa.common.service;
 
-import com.td.WaDa.common.pojo.ComConfig;
-import com.td.WaDa.game.complayersattri.vo.ComPlayersLuckyLandLevelUpVo;
+import com.td.Dawa.common.pojo.ComConfig;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersLuckyLandLevelUpVo;
 
 import java.util.List;
 

src/main/java/com/td/WaDa/common/service/ComConfigServiceImpl.java → src/main/java/com/td/Dawa/common/service/ComConfigServiceImpl.java

@@ -1,11 +1,11 @@
-package com.td.WaDa.common.service;
+package com.td.Dawa.common.service;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
-import com.td.WaDa.common.pojo.ComConfig;
-import com.td.WaDa.common.repository.ComConfigRepository;
-import com.td.WaDa.game.complayersattri.vo.ComPlayersLuckyLandLevelUpVo;
+import com.td.Dawa.common.pojo.ComConfig;
+import com.td.Dawa.common.repository.ComConfigRepository;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersLuckyLandLevelUpVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;

src/main/java/com/td/WaDa/common/service/CommonService.java → src/main/java/com/td/Dawa/common/service/CommonService.java

@@ -1,8 +1,8 @@
-package com.td.WaDa.common.service;
+package com.td.Dawa.common.service;
 
 
-import com.td.WaDa.common.pojo.PageInfo;
-import com.td.WaDa.common.pojo.Result;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.pojo.Result;
 
 import java.util.List;
 

src/main/java/com/td/WaDa/common/service/CommonServiceImpl.java → src/main/java/com/td/Dawa/common/service/CommonServiceImpl.java

@@ -1,14 +1,13 @@
-package com.td.WaDa.common.service;
-
-import com.td.WaDa.common.pojo.PageCondition;
-import com.td.WaDa.common.pojo.PageInfo;
-import com.td.WaDa.common.pojo.Result;
-import com.td.WaDa.common.repository.CommonRepository;
-import com.td.WaDa.util.CopyUtil;
-import com.td.WaDa.util.ErrorUtil;
-import com.td.WaDa.util.UUIDUtil;
+package com.td.Dawa.common.service;
+
+import com.td.Dawa.common.pojo.PageCondition;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.common.repository.CommonRepository;
+import com.td.Dawa.util.CopyUtil;
+import com.td.Dawa.util.ErrorUtil;
+import com.td.Dawa.util.UUIDUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.math3.analysis.function.Identity;
 import org.hibernate.annotations.NotFound;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/td/WaDa/config/async/AsyncConfig.java → src/main/java/com/td/Dawa/config/async/AsyncConfig.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.config.async;
+package com.td.Dawa.config.async;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/td/Dawa/config/enums/GameEnum.java

@@ -0,0 +1,71 @@
+package com.td.Dawa.config.enums;
+
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author:slambb
+ * @date:2022/06/01
+ */
+@Getter
+public enum GameEnum {
+    CHARACTERS_STATE_NORMAL(0,"角色普通状态"),
+    CHARACTERS_STATE_TRADE_BANK(1,"角色在交易行状态"),
+    CHARACTERS_STATE_IN_TEAM(2,"角色在队列状态"),
+    CHARACTERS_STATE_IN_WORK(3,"角色在工作状态"),
+
+    WORK_ING(0,"探索工作进行中"),
+    WORK_COMPLETE(1,"探索工作完成"),
+    WORK_NOT_STARTED(2,"探索工作未开始"),
+
+    PRO_POWER(0,"挖矿"),
+    PRO_INTELLIGENCE(1,"勘探"),
+    PRO_SKIlLS(2,"运输"),
+
+    //伐木场景id
+    LUMBERING_00(101,"深林入口"),
+    LUMBERING_01(102,"深林一层"),
+    LUMBERING_02(103,"深林二层"),
+    LUMBERING_03(104,"深林三层"),
+    LUMBERING_04(105,"深林最深处"),
+
+    //矿洞场景id
+    MINE_00(201,"矿洞入口"),
+    MINE_01(202,"矿洞一层"),
+    MINE_02(203,"矿洞二层"),
+    MINE_03(204,"矿洞三层"),
+    MINE_04(205,"矿洞最深处"),
+    LIMIT_LEVEL(5,"现在层级，最后需要配置表设置"),
+
+
+    //属性区间
+    ATTRIBUTE_01(60,"属性等级1"),
+    ATTRIBUTE_02(100,"属性等级2"),
+    ATTRIBUTE_03(140,"属性等级3"),
+    ATTRIBUTE_04(180,"属性等级4"),
+    ATTRIBUTE_05(220,"属性等级5"),
+    ATTRIBUTE_06(260,"属性等级6");
+
+    private Integer value;
+    private String message;
+
+    GameEnum(Integer value, String message) {
+        this.value = value;
+        this.message = message;
+    }
+
+
+    //放入map中，通过键取值
+    private static Map<Integer,GameEnum> gMap = new HashMap<>();
+    static {
+        for (GameEnum value : GameEnum .values()) {
+            gMap.put(value.getValue(),value);
+        }
+    }
+    public static GameEnum getByValue(Integer value){
+        return gMap.get(value);
+    }
+}

src/main/java/com/td/WaDa/config/enums/ResultEnum.java → src/main/java/com/td/Dawa/config/enums/ResultEnum.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.config.enums;
+package com.td.Dawa.config.enums;
 
 import lombok.Getter;
 
@@ -48,14 +48,23 @@ public enum ResultEnum {
     PLAYER_GOODS_WEAR_NUM_ERROR(515,"请输入对应的参数,isWear:0或者1"),
     PLAYER_GOODS_NO_QUIP_REQUIRED(516,"不用获取多余装备"),
     PLAYER_GOODS_SEEDS_AMOUNT_ERROR(517,"土地消耗种子数量不足"),
-    PLAYER_ATTRIBUTE_STRENGTH_IS_NOT(518,"用户体力不足"),
+    PLAYER_ATTRIBUTE_STRENGTH_IS_NOT(518,"当前体力不足，队伍无法工作"),
     PLAYER_GOODS_SAVE_LOCK(520,"操作繁忙，保存背包失败，稍后再试！"),
 
     ROLE_DOES_NOT_EXIST(521,"不存在角色信息！"),
     ROLE_ADD_ERROR(522,"添加角色信息异常！"),
+    ROLE_ALREADY_ADD(522,"角色已经添加！"),
+    GOLD_NOT_GET_ROLE(522,"金币不足，无法召唤！"),
+    ROLE_REPATRIATE_ERROR(522,"角色遣返错误！"),
+
     EXPLORATION_INFO_ERROR(523 ,"勘探队伍异常！"),
     EXPLORATION_ERROR(524 ,"勘探信息异常！"),
-    EXPLORATION_TIME_ERROR(523 ,"勘探时间异常！"),
+    EXPLORATION_TIME_ERROR(525 ,"勘探时间异常！"),
+    EXPLORATION_INFO_NULL(526,"请先创建勘探队伍！"),
+    EXPLORATION_NOT_START(527,"请先开始工作勘探队伍！"),
+    EXPLORATION_ING(527,"勘探队伍正在工作！"),
+    EXPLORATION_COMPLETE(527,"勘探队伍已完成工作！"),
+    EXPLORATION_NOT_STOP(528,"工作时间未结束！"),
     //钱包数据
     WALLET_CNT_PLAY_ERROR(601,"钱包CNT支付参数数据错误！"),
     WALLET_SNB_INSUFFICIENT_QUANTITY(602,"snb不足以支付！"),
@@ -67,6 +76,7 @@ public enum ResultEnum {
     APPLY_SNB_HAS_APPLY(607,"已有一笔snb申请中，待审核完成后再申请！"),
     APPLY_SNB_STATE_ERROR(608,"状态信息错误！"),
 
+
     WALLET_SNB_ABNORMAL(609,"SNB异常状态"),
     //土地数据
     LAND_DATA_ERROR(701,"土地数据不能初始化！"),
@@ -130,6 +140,9 @@ public enum ResultEnum {
 
 
     FRUIT_AMOUNT_IS_ZERO_AND_NOT_MULTIPLE(814,"请输入出售果实的数量！"),
+
+    //excel 配置信息
+    EXCEL_ERROR(901,"excel 配置错误！"),
     ;
     private Integer code;
 

src/main/java/com/td/WaDa/config/exception/AuthorizeException.java → src/main/java/com/td/Dawa/config/exception/AuthorizeException.java

@@ -1,6 +1,6 @@
-package com.td.WaDa.config.exception;
+package com.td.Dawa.config.exception;
 
-import com.td.WaDa.config.enums.ResultEnum;
+import com.td.Dawa.config.enums.ResultEnum;
 import lombok.Getter;
 
 /**

src/main/java/com/td/WaDa/config/logback/LoggingWSServer.java → src/main/java/com/td/Dawa/config/logback/LoggingWSServer.java

@@ -1,8 +1,8 @@
-package com.td.WaDa.config.logback;
+package com.td.Dawa.config.logback;
 
 
-import com.td.WaDa.config.websocket.MyEndpointConfigure;
-import com.td.WaDa.util.ErrorUtil;
+import com.td.Dawa.config.websocket.MyEndpointConfigure;
+import com.td.Dawa.util.ErrorUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

src/main/java/com/td/WaDa/config/monitor/MonitorWSServer.java → src/main/java/com/td/Dawa/config/monitor/MonitorWSServer.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.config.monitor;
+package com.td.Dawa.config.monitor;
 
 
-import com.td.WaDa.config.websocket.MyEndpointConfigure;
-import com.td.WaDa.util.ErrorUtil;
-import com.td.WaDa.util.SystemMonitorUtil;
+import com.td.Dawa.config.websocket.MyEndpointConfigure;
+import com.td.Dawa.util.ErrorUtil;
+import com.td.Dawa.util.SystemMonitorUtil;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/td/WaDa/config/security/CaptchaFilterConfig.java → src/main/java/com/td/Dawa/config/security/CaptchaFilterConfig.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
-import com.td.WaDa.common.pojo.ParameterRequestWrapper;
-import com.td.WaDa.util.*;
+import com.td.Dawa.common.pojo.ParameterRequestWrapper;
+import com.td.Dawa.util.*;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/td/WaDa/config/security/DynamicallyUrlInterceptor.java → src/main/java/com/td/Dawa/config/security/DynamicallyUrlInterceptor.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
 import org.springframework.security.access.AccessDecisionManager;
 import org.springframework.security.access.SecurityMetadataSource;

src/main/java/com/td/WaDa/config/security/ErrorPageConfig.java → src/main/java/com/td/Dawa/config/security/ErrorPageConfig.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
 import org.springframework.boot.web.server.ErrorPage;
 import org.springframework.boot.web.server.ErrorPageRegistrar;

src/main/java/com/td/WaDa/config/security/LoginFailureHandlerConfig.java → src/main/java/com/td/Dawa/config/security/LoginFailureHandlerConfig.java

@@ -1,8 +1,8 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
-import com.td.WaDa.util.*;
+import com.td.Dawa.util.*;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/td/WaDa/config/security/LoginSuccessHandlerConfig.java → src/main/java/com/td/Dawa/config/security/LoginSuccessHandlerConfig.java

@@ -1,10 +1,10 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
-import com.td.WaDa.sys.sysuser.service.SysUserService;
-import com.td.WaDa.sys.sysuser.vo.SysUserVo;
-import com.td.WaDa.util.*;
+import com.td.Dawa.sys.sysuser.service.SysUserService;
+import com.td.Dawa.sys.sysuser.vo.SysUserVo;
+import com.td.Dawa.util.*;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/td/WaDa/config/security/LogoutHandlerConfig.java → src/main/java/com/td/Dawa/config/security/LogoutHandlerConfig.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;

src/main/java/com/td/WaDa/config/security/MyAccessDecisionManager.java → src/main/java/com/td/Dawa/config/security/MyAccessDecisionManager.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;

src/main/java/com/td/WaDa/config/security/MyFilterInvocationSecurityMetadataSource.java → src/main/java/com/td/Dawa/config/security/MyFilterInvocationSecurityMetadataSource.java

@@ -1,6 +1,6 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
-import com.td.WaDa.sys.sysauthority.vo.SysAuthorityVo;
+import com.td.Dawa.sys.sysauthority.vo.SysAuthorityVo;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.web.FilterInvocation;

src/main/java/com/td/WaDa/config/security/MyInvalidSessionStrategy.java → src/main/java/com/td/Dawa/config/security/MyInvalidSessionStrategy.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/td/WaDa/config/security/PasswordConfig.java → src/main/java/com/td/Dawa/config/security/PasswordConfig.java

@@ -1,6 +1,6 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
-import com.td.WaDa.util.MD5Util;
+import com.td.Dawa.util.MD5Util;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 

src/main/java/com/td/WaDa/config/security/SecurityConfig.java → src/main/java/com/td/Dawa/config/security/SecurityConfig.java

@@ -1,7 +1,7 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
-import com.td.WaDa.sys.sysauthority.service.SysAuthorityService;
-import com.td.WaDa.sys.sysauthority.vo.SysAuthorityVo;
+import com.td.Dawa.sys.sysauthority.service.SysAuthorityService;
+import com.td.Dawa.sys.sysauthority.vo.SysAuthorityVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.access.AccessDecisionVoter;

src/main/java/com/td/WaDa/config/security/UserConfig.java → src/main/java/com/td/Dawa/config/security/UserConfig.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
-import com.td.WaDa.sys.sysuser.service.SysUserService;
-import com.td.WaDa.sys.sysuser.vo.SysUserVo;
-import com.td.WaDa.sys.sysuserauthority.service.SysUserAuthorityService;
-import com.td.WaDa.sys.sysuserauthority.vo.SysUserAuthorityVo;
+import com.td.Dawa.sys.sysuser.service.SysUserService;
+import com.td.Dawa.sys.sysuser.vo.SysUserVo;
+import com.td.Dawa.sys.sysuserauthority.service.SysUserAuthorityService;
+import com.td.Dawa.sys.sysuserauthority.vo.SysUserAuthorityVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.User;

src/main/java/com/td/WaDa/config/security/gameConfig.java → src/main/java/com/td/Dawa/config/security/gameConfig.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.config.security;
+package com.td.Dawa.config.security;
 
-import com.td.WaDa.sys.sysuser.service.SysUserService;
-import com.td.WaDa.sys.sysuser.vo.SysUserVo;
-import com.td.WaDa.sys.sysuserauthority.service.SysUserAuthorityService;
-import com.td.WaDa.sys.sysuserauthority.vo.SysUserAuthorityVo;
+import com.td.Dawa.sys.sysuser.service.SysUserService;
+import com.td.Dawa.sys.sysuser.vo.SysUserVo;
+import com.td.Dawa.sys.sysuserauthority.service.SysUserAuthorityService;
+import com.td.Dawa.sys.sysuserauthority.vo.SysUserAuthorityVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.User;

src/main/java/com/td/WaDa/config/token/WebConfig.java → src/main/java/com/td/Dawa/config/token/WebConfig.java

@@ -1,6 +1,6 @@
-package com.td.WaDa.config.token;
+package com.td.Dawa.config.token;
 
-import com.td.WaDa.filter.gameFilter;
+import com.td.Dawa.filter.gameFilter;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/td/WaDa/config/websocket/MyEndpointConfigure.java → src/main/java/com/td/Dawa/config/websocket/MyEndpointConfigure.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.config.websocket;
+package com.td.Dawa.config.websocket;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;

src/main/java/com/td/WaDa/config/websocket/WebSocketConfig.java → src/main/java/com/td/Dawa/config/websocket/WebSocketConfig.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.config.websocket;
+package com.td.Dawa.config.websocket;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/td/WaDa/filter/gameFilter.java → src/main/java/com/td/Dawa/filter/gameFilter.java

@@ -1,19 +1,13 @@
-package com.td.WaDa.filter;
+package com.td.Dawa.filter;
 
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.crypto.asymmetric.KeyType;
-import cn.hutool.crypto.asymmetric.RSA;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.td.WaDa.common.pojo.ParameterRequestWrapper;
-import com.td.WaDa.common.pojo.Result;
-import com.td.WaDa.config.enums.ResultEnum;
-import com.td.WaDa.util.*;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.util.*;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.SignatureException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -24,9 +18,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -131,7 +123,7 @@ public class gameFilter implements Filter {
             return;
         }
 
-
+        log.info("token:" + token);
         if (null == token || token.isEmpty() || !token.startsWith("Bearer ")) {
             //没有token信息
             response.setCharacterEncoding("UTF-8");

src/main/java/com/td/Dawa/game/comcharacters/controller/ComCharactersController.java

@@ -0,0 +1,187 @@
+package com.td.Dawa.game.comcharacters.controller;
+
+import cn.hutool.core.date.DateUtil;
+import com.td.Dawa.annotation.Encrypt;
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.config.enums.GameEnum;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.config.exception.AuthorizeException;
+import com.td.Dawa.game.comcharacters.pojo.ComCharacters;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersClientVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersRandomVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersSimpleVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.comcharacters.service.ComCharactersService;
+import com.td.Dawa.game.comusers.service.ComUsersService;
+import com.td.Dawa.game.excelcharacterattri.pojo.ExcelCharacterAttri;
+import com.td.Dawa.game.excelcharacterattri.service.ExcelCharacterAttriService;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriVo;
+import com.td.Dawa.util.CopyUtil;
+import net.bytebuddy.implementation.bytecode.Throw;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.naming.AuthenticationException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/game/comCharacters/")
+public class ComCharactersController extends CommonController<ComCharactersVo, ComCharacters, Integer> {
+    @Autowired
+    private ComCharactersService comCharactersService;
+
+    @Autowired
+    private ExcelCharacterAttriService excelCharacterAttriService;
+
+    @Autowired
+    private ComUsersService comUsersService;
+
+    /**
+     * 返回三个随机的角色数据
+     *
+     * @param userId
+     * @return
+     */
+    @PostMapping("getRole")
+    @Encrypt
+    public Result<List<ComCharactersRandomVo>> getRole(@RequestParam(value = "userId") String userId) {
+
+        //消耗
+        try {
+            //消耗金币返回一个提示
+            comUsersService.consumesGoldFromGetRole(userId);
+            //1.excel 随机拿出number 数据, todo 暂时以attri表为主
+            List<ComCharactersRandomVo> excelCharacter =  comCharactersService.randomRoleByNumber(3);
+            //2.返回给前端一个character 数据表里面
+            return Result.of(excelCharacter);
+        }catch (AuthorizeException e) {
+            return Result.of(null, false, e.getMessage(), e.getCode());
+        }
+
+
+    }
+
+    /**
+     * 玩家选择一个添加角色,
+     * 根据角色id，生成属性，添加成功后， todo 扣除对应的消费金额
+     *
+     * @param userId
+     * @return
+     */
+    @PostMapping("addRole")
+    @Encrypt
+    public Result<ComCharactersClientVo> addRole(@RequestParam(value = "userId") String userId,
+                                                 @RequestParam(value = "roleId") Integer roleId) {
+
+        //todo  暂时roleType对应这roleId
+        //      暂时可以创建多个相同的角色
+        try {
+            //拿出一个角色对应的配置数据来生成角色
+            ExcelCharacterAttriVo excelCharacterAttriVo = excelCharacterAttriService.getVo(roleId);
+            if (excelCharacterAttriVo == null) {
+                return Result.of(null, false, ResultEnum.ROLE_DOES_NOT_EXIST);
+            }
+            //根据roleId 对应的数据，生成玩家数据,属性
+            ComCharactersClientVo comCharacters = comCharactersService.addRole(excelCharacterAttriVo, userId);
+            return Result.of(comCharacters);
+        } catch (Exception e) {
+            return Result.of(null, false, ResultEnum.ROLE_ADD_ERROR);
+        }
+
+    }
+
+
+    /**
+     * 修改名字
+     * @param userId
+     * @param id 使用 com_characters 里面的 id修改名字
+     * @param name
+     * @return
+     */
+    @PostMapping("modifyRoleName")
+    @Encrypt
+    public Result<ComCharactersClientVo> modifyRoleName(@RequestParam(value = "userId") String userId,
+                                                        @RequestParam(value = "id") Integer id,
+                                                        @RequestParam(value = "name") String name) {
+        try {
+            //todo  暂时roleType对应这roleId
+            ComCharactersVo comCharactersVo = comCharactersService.getVo(id);
+            if (comCharactersVo == null) {
+                return Result.of(null, false, ResultEnum.ROLE_DOES_NOT_EXIST);
+            }
+            //判定是否是自己的数据
+            if(!comCharactersVo.getUserId().equals(userId)){
+                return Result.of(null, false, ResultEnum.ROLE_ADD_ERROR);
+            }
+            if(StringUtils.hasText(name)){
+                comCharactersVo.setName(name);
+            }else{
+                //加入传入是空的，用id来作为名字
+                comCharactersVo.setName(comCharactersVo.getId().toString());
+            }
+            comCharactersVo.setUpdateTime(DateUtil.date());
+            comCharactersService.save(comCharactersVo);
+            return Result.of(CopyUtil.copy(comCharactersVo, ComCharactersClientVo.class));
+
+
+        } catch (Exception e) {
+            return Result.of(null, false, ResultEnum.ROLE_ADD_ERROR);
+        }
+
+    }
+
+
+    /**
+     * 列表排列顺序，根据选中职业对应属性高低排序
+     * 挖矿：力量高的排前边
+     * 勘探：智力高的排前边
+     * 运输：技巧高的排前边
+     *
+     * @param userId
+     * @return
+     */
+    @PostMapping("getRoleList")
+    @Encrypt
+    public Result<List<ComCharactersClientVo>> getRoleList(@RequestParam(value = "userId") String userId,
+    @RequestParam(value = "professional") String professional) {
+        List<ComCharactersClientVo> charactersClientVos = comCharactersService.findByProfessionalSort(userId,professional);
+        return Result.of(charactersClientVos);
+    }
+
+    /**
+     * 遣返角色
+     * 根据当前角色state判断是否可遣返
+     * @param userId
+     * @param id
+     * @return
+     */
+    @PostMapping("repatriateRole")
+    @Encrypt
+    public Result<String> repatriateRole(@RequestParam(value = "userId") String userId,
+                                                        @RequestParam(value = "id") Integer id) {
+        try {
+            //todo  暂时roleType对应这roleId
+            ComCharactersVo comCharactersVo = comCharactersService.getVo(id);
+            if (comCharactersVo == null) {
+                return Result.of(null, false, ResultEnum.ROLE_DOES_NOT_EXIST);
+            }
+            //判定是否是自己的数据
+            if(!comCharactersVo.getUserId().equals(userId)){
+                return Result.of(null, false, ResultEnum.ROLE_REPATRIATE_ERROR);
+            }
+            //todo 判断是否处于空闲中，否则不能遣返
+            if(comCharactersVo.getState().equals(GameEnum.CHARACTERS_STATE_NORMAL.getValue())){
+                //删除角色
+                comCharactersService.delete(id);
+                return Result.of("删除成功");
+            }else{
+                return Result.of(GameEnum.getByValue(comCharactersVo.getState()).getMessage());
+            }
+        } catch (Exception e) {
+            return Result.of(null, false, ResultEnum.ROLE_REPATRIATE_ERROR);
+        }
+
+    }
+}

src/main/java/com/td/WaDa/game/comcharacters/pojo/ComCharacters.java → src/main/java/com/td/Dawa/game/comcharacters/pojo/ComCharacters.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comcharacters.pojo;
+package com.td.Dawa.game.comcharacters.pojo;
 
 import lombok.Data;
 import javax.persistence.*;

src/main/java/com/td/WaDa/game/comcharacters/repository/ComCharactersRepository.java → src/main/java/com/td/Dawa/game/comcharacters/repository/ComCharactersRepository.java

@@ -1,7 +1,7 @@
-package com.td.WaDa.game.comcharacters.repository;
+package com.td.Dawa.game.comcharacters.repository;
 
-import com.td.WaDa.common.repository.*;
-import com.td.WaDa.game.comcharacters.pojo.ComCharacters;
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.comcharacters.pojo.ComCharacters;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/td/Dawa/game/comcharacters/service/ComCharactersService.java

@@ -0,0 +1,24 @@
+package com.td.Dawa.game.comcharacters.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comcharacters.pojo.ComCharacters;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersClientVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersRandomVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.excelcharacterattri.pojo.ExcelCharacterAttri;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriVo;
+
+import java.util.List;
+
+public interface ComCharactersService extends CommonService<ComCharactersVo, ComCharacters, Integer> {
+
+    public List<ComCharactersRandomVo> randomRoleByNumber(Integer number);
+
+    public List<ComCharactersClientVo> findByProfessionalSort(String userId,String professional);
+
+    public ComCharactersClientVo addRole(ExcelCharacterAttriVo _attr, String userId);
+
+    public ComCharacters findByRoleId(Integer roleId);
+
+    public List<ComCharacters> findByRoleIdIn(Integer[] ids);
+}

src/main/java/com/td/WaDa/game/comcharacters/service/ComCharactersServiceImpl.java → src/main/java/com/td/Dawa/game/comcharacters/service/ComCharactersServiceImpl.java

@@ -1,19 +1,23 @@
-package com.td.WaDa.game.comcharacters.service;
+package com.td.Dawa.game.comcharacters.service;
 
 import cn.hutool.core.date.DateUtil;
-import com.td.WaDa.common.service.*;
-import com.td.WaDa.config.enums.GameEnum;
-import com.td.WaDa.game.comcharacters.pojo.ComCharacters;
-import com.td.WaDa.game.comcharacters.vo.ComCharactersClientVo;
-import com.td.WaDa.game.comcharacters.vo.ComCharactersVo;
-import com.td.WaDa.game.comcharacters.repository.ComCharactersRepository;
-import com.td.WaDa.game.excelcharacterattri.pojo.ExcelCharacterAttri;
-import com.td.WaDa.game.excelcharacterattri.repository.ExcelCharacterAttriRepository;
-import com.td.WaDa.game.excelcharacterattri.service.ExcelCharacterAttriService;
-import com.td.WaDa.game.excelcharactercreate.pojo.ExcelCharacterCreate;
-import com.td.WaDa.game.excelcharactercreate.service.ExcelCharacterCreateService;
-import com.td.WaDa.game.excelcharactercreate.vo.ExcelCharacterCreateClientVo;
-import com.td.WaDa.util.CopyUtil;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.config.enums.GameEnum;
+import com.td.Dawa.game.comcharacters.pojo.ComCharacters;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersClientVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersRandomVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.comcharacters.repository.ComCharactersRepository;
+import com.td.Dawa.game.excelcharacterattri.pojo.ExcelCharacterAttri;
+import com.td.Dawa.game.excelcharacterattri.repository.ExcelCharacterAttriRepository;
+import com.td.Dawa.game.excelcharacterattri.service.ExcelCharacterAttriService;
+import com.td.Dawa.game.excelcharacterattri.vo.ExcelCharacterAttriVo;
+import com.td.Dawa.game.excelcharactercreate.pojo.ExcelCharacterCreate;
+import com.td.Dawa.game.excelcharactercreate.service.ExcelCharacterCreateService;
+import com.td.Dawa.game.excelcharactercreate.vo.ExcelCharacterCreateClientVo;
+import com.td.Dawa.game.excelcharacterlevel.service.ExcelCharacterLevelService;
+import com.td.Dawa.game.excelcharacterlevel.vo.ExcelCharacterLevelVo;
+import com.td.Dawa.util.CopyUtil;
 import org.hibernate.query.criteria.internal.CriteriaBuilderImpl;
 import org.hibernate.query.criteria.internal.expression.function.BasicFunctionExpression;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +26,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
@@ -50,8 +55,12 @@ public class ComCharactersServiceImpl extends CommonServiceImpl<ComCharactersVo,
     @Autowired
     private ExcelCharacterAttriService excelCharacterAttriService;
 
+    @Autowired
+    private ExcelCharacterLevelService excelCharacterLevelService;
+
+
     @Override
-    public List<ComCharactersClientVo> randomRoleByNumber(Integer number) {
+    public List<ComCharactersRandomVo> randomRoleByNumber(Integer number) {
         Specification<ExcelCharacterAttri> specification = (root, query, cb) -> {
             //Predicate pd = cb.and(cb.equal(root.get("title"), "测试题"));
             Expression<Double> e = new BasicFunctionExpression<>(
@@ -63,19 +72,15 @@ public class ComCharactersServiceImpl extends CommonServiceImpl<ComCharactersVo,
         //1.获取了number 数量的 roleType todo 可加入内存
         List<ExcelCharacterAttri> excelCharacterAttrList = excelCharacterAttriRepository.findAll(specification, PageRequest.of(0, number)).toList();
         //2.根据roleType分类
-        List<ComCharactersClientVo> characters = new ArrayList<>();
+        List<ComCharactersRandomVo> characters = new ArrayList<>();
         //3.查询role表全部数据
-        List<Integer> roleIds = excelCharacterAttrList.stream().map(e -> e.getRoleType()).collect(Collectors.toList());
-        //List<ExcelCharacterCreate> excelCharacterCreates =  excelCharacterCreateService.findRoleIdInByDESC(roleIds);
-
-        //Map<Integer, List<ExcelCharacterCreate>> listMap = excelCharacterCreates.stream().collect(Collectors.groupingBy(ExcelCharacterCreate::getRoleId));
+        //List<Integer> roleIds = excelCharacterAttrList.stream().map(e -> e.getRoleType()).collect(Collectors.toList());
         for (ExcelCharacterAttri excelCharacterAttr : excelCharacterAttrList) {
-            ComCharactersClientVo character = new ComCharactersClientVo();
-            character.setId(excelCharacterAttr.getId());
-            character.setRoleId(excelCharacterAttr.getRoleType());
+            ComCharactersRandomVo character = new ComCharactersRandomVo();
+            character.setRoleId(excelCharacterAttr.getId());
             character.setRoleType(excelCharacterAttr.getRoleType());
-            //List<ExcelCharacterCreate> subExcelCharacterList = listMap.get(excelCharacterAttr.getRoleType());
-            //character.setSubCreateClientList(CopyUtil.copyList(subExcelCharacterList,ExcelCharacterCreateClientVo.class));
+            character.setAction(excelCharacterAttr.getAction());
+            character.setInteractive(excelCharacterAttr.getInteractive());
             characters.add(character);
         }
         return characters;
@@ -83,13 +88,13 @@ public class ComCharactersServiceImpl extends CommonServiceImpl<ComCharactersVo,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ComCharactersClientVo addRole(ExcelCharacterAttri _attr, String userId) {
+    public ComCharactersClientVo addRole(ExcelCharacterAttriVo _attr, String userId) {
 
         Integer roleType = _attr.getRoleType();//todo 暂时用属性表里面的roleType
         //1.添加一个角色
         ComCharacters comCharacters = new ComCharacters();
         comCharacters.setUserId(userId);
-        comCharacters.setRoleId(roleType); //todo  暂时是roleType对应roleId
+        comCharacters.setRoleId(_attr.getId()); //用属性的id来设置roleId
         comCharacters.setRoleType(roleType);
         //力量
         Double _powerDouble = new Random().nextDouble() * (_attr.getStartPowerLimitUpper() - _attr.getStartPowerLimitLower()) + _attr.getStartPowerLimitLower();
@@ -121,14 +126,23 @@ public class ComCharactersServiceImpl extends CommonServiceImpl<ComCharactersVo,
         modelId.add(5);
         List<ExcelCharacterCreate> _list = excelCharacterCreateService.findIdInByDESC(modelId);
         comCharacters.setModelId("1|2|3|4|5");
-        //todo 需要扣除对应金币
 
+        //设置经验和等级
+        comCharacters.setExp(0);
+        comCharacters.setLevel(1);
+        //todo 需要扣除对应金币
 
         comCharacters.setCreateTime(DateUtil.date());
         comCharacters.setUpdateTime(DateUtil.date());
+        comCharacters = comCharactersRepository.saveAndFlush(comCharacters);
+        //再存储一次id，根据当前生成的角色自增id来作为名字
+        comCharacters.setName(comCharacters.getId().toString());
         comCharactersRepository.save(comCharacters);
 
         ComCharactersClientVo clientVo = CopyUtil.copy(comCharacters, ComCharactersClientVo.class);
+        //设置第二级的升级经验
+        ExcelCharacterLevelVo excelCharacterLevelVo = excelCharacterLevelService.getVo(2);
+        clientVo.setLevelUpExp(excelCharacterLevelVo.getExp());
         clientVo.setSubCreateClientList(CopyUtil.copyList(_list,ExcelCharacterCreateClientVo.class));
         return clientVo;
     }

src/main/java/com/td/WaDa/game/comcharacters/vo/ComCharactersClientVo.java → src/main/java/com/td/Dawa/game/comcharacters/vo/ComCharactersClientVo.java

@@ -1,10 +1,9 @@
-package com.td.WaDa.game.comcharacters.vo;
+package com.td.Dawa.game.comcharacters.vo;
 
-import com.td.WaDa.game.excelcharactercreate.vo.ExcelCharacterCreateClientVo;
+import com.td.Dawa.game.excelcharactercreate.vo.ExcelCharacterCreateClientVo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 @Data

src/main/java/com/td/Dawa/game/comcharacters/vo/ComCharactersRandomVo.java

@@ -0,0 +1,20 @@
+package com.td.Dawa.game.comcharacters.vo;
+
+import com.td.Dawa.game.excelcharactercreate.vo.ExcelCharacterCreateClientVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ComCharactersRandomVo implements Serializable {
+
+    private Integer roleId;//角色生成表 里面对应的id序号
+
+    private Integer roleType;//角色种类（角色等级表和角色属性表相关）
+
+    private String action;//携带动作
+
+    private String interactive;//互动事件
+
+}

src/main/java/com/td/WaDa/game/comcharacters/vo/ComCharactersSimpleVo.java → src/main/java/com/td/Dawa/game/comcharacters/vo/ComCharactersSimpleVo.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comcharacters.vo;
+package com.td.Dawa.game.comcharacters.vo;
 
 import lombok.Data;
 import java.io.Serializable;

src/main/java/com/td/WaDa/game/comcharacters/vo/ComCharactersVo.java → src/main/java/com/td/Dawa/game/comcharacters/vo/ComCharactersVo.java

@@ -1,6 +1,6 @@
-package com.td.WaDa.game.comcharacters.vo;
+package com.td.Dawa.game.comcharacters.vo;
 
-import com.td.WaDa. common.pojo.PageCondition;import lombok.Data;
+import com.td.Dawa. common.pojo.PageCondition;import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 

src/main/java/com/td/WaDa/game/comcharactersdiscovery/controller/ComCharactersDiscoveryController.java → src/main/java/com/td/Dawa/game/comcharactersdiscovery/controller/ComCharactersDiscoveryController.java

@@ -1,20 +1,21 @@
-package com.td.WaDa.game.comcharactersdiscovery.controller;
+package com.td.Dawa.game.comcharactersdiscovery.controller;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
-import com.td.WaDa.annotation.Decrypt;
-import com.td.WaDa.annotation.Encrypt;
-import com.td.WaDa.common.controller.*;
-import com.td.WaDa.common.pojo.PageInfo;
-import com.td.WaDa.common.pojo.Result;
-import com.td.WaDa.config.enums.ResultEnum;
-import com.td.WaDa.game.comcharacters.service.ComCharactersService;
-import com.td.WaDa.game.comcharacters.vo.ComCharactersVo;
-import com.td.WaDa.game.comcharactersdiscovery.pojo.ComCharactersDiscovery;
-import com.td.WaDa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryClientVo;
-import com.td.WaDa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryVo;
-import com.td.WaDa.game.comcharactersdiscovery.service.ComCharactersDiscoveryService;
-import com.td.WaDa.util.CopyUtil;
+import com.td.Dawa.annotation.Decrypt;
+import com.td.Dawa.annotation.Encrypt;
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.config.exception.AuthorizeException;
+import com.td.Dawa.game.comcharacters.service.ComCharactersService;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.comcharactersdiscovery.pojo.ComCharactersDiscovery;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryClientVo;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryVo;
+import com.td.Dawa.game.comcharactersdiscovery.service.ComCharactersDiscoveryService;
+import com.td.Dawa.util.CopyUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +29,26 @@ public class ComCharactersDiscoveryController extends CommonController<ComCharac
     @Autowired
     private ComCharactersService comCharactersService;
 
+    /**
+     * 开始工作
+     *
+     * @param userId
+     * @param sceneId
+     * @return
+     */
+    @PostMapping("startExploration")
+    @Decrypt
+    @Encrypt
+    public Result<ComCharactersDiscoveryClientVo> startExploration(@RequestParam(value = "userId") String userId,
+                                                                   @RequestParam(value = "sceneId") Integer sceneId) {
+        try {
+            ComCharactersDiscoveryVo characterDiscoveryVo = comCharactersDiscoveryService.startDiscover(userId, sceneId);
+            return Result.of(CopyUtil.copy(characterDiscoveryVo, ComCharactersDiscoveryClientVo.class));
+        } catch (AuthorizeException e) {
+            return Result.of(null, false, e.getMessage(), e.getCode());
+        }
+
+    }
 
     /**
      * 玩家选择一个添加角色,添加工作
@@ -40,7 +61,7 @@ public class ComCharactersDiscoveryController extends CommonController<ComCharac
     @PostMapping("addExplorationRole")
     @Decrypt
     @Encrypt
-    public Result<ComCharactersDiscoveryClientVo> addExplorationRole(@RequestParam(value = "userId") String userId,
+    public Result<?> addExplorationRole(@RequestParam(value = "userId") String userId,
                                                                      @RequestParam(value = "roleId") Integer roleId,
                                                                      @RequestParam(value = "sceneId") Integer sceneId) {
         try {
@@ -49,13 +70,15 @@ public class ComCharactersDiscoveryController extends CommonController<ComCharac
             //拿出一个角色对应的配置数据来生成角色
             ComCharactersVo comCharactersVo = comCharactersService.getVo(roleId);
             if (comCharactersVo == null || !comCharactersVo.getUserId().equals(userId)) {
-                return Result.of(null, false, ResultEnum.ROLE_DOES_NOT_EXIST.getMessage(), ResultEnum.ROLE_DOES_NOT_EXIST.getCode());
+                return Result.of(null, false, ResultEnum.ROLE_DOES_NOT_EXIST);
             }
             //根据roleId 对应的数据，生成玩家数据,属性
-            ComCharactersDiscoveryVo characterDiscoveryVo = comCharactersDiscoveryService.addDiscoverRole(comCharactersVo, sceneId);
-            return Result.of(CopyUtil.copy(characterDiscoveryVo, ComCharactersDiscoveryClientVo.class));
+            ComCharactersDiscoveryClientVo clientVo = comCharactersDiscoveryService.addDiscoverRole(comCharactersVo, sceneId);
+            return Result.of(clientVo);
+        } catch (AuthorizeException e) {
+            return Result.of(null, false, e.getMessage(), e.getCode());
         } catch (Exception e) {
-            return Result.of(null, false, ResultEnum.ROLE_ADD_ERROR.getMessage(), ResultEnum.ROLE_ADD_ERROR.getCode());
+            return Result.of(e.getMessage(), false, ResultEnum.ROLE_ADD_ERROR);
         }
 
     }
@@ -67,7 +90,7 @@ public class ComCharactersDiscoveryController extends CommonController<ComCharac
      * @param userId
      * @return
      */
-    @GetMapping("getExplorationList")
+    @PostMapping("getExplorationList")
     @Encrypt
     public Result<PageInfo<ComCharactersDiscoveryClientVo>> getExplorationList(@RequestParam(value = "userId") String userId,
                                                                                @RequestParam(value = "page", defaultValue = "0") Integer page,
@@ -85,60 +108,31 @@ public class ComCharactersDiscoveryController extends CommonController<ComCharac
     /**
      * 根据探索队伍的id，更新当前探索的状态
      * 用于处理中途显示奖励之类的操作
+     *
      * @param userId
      * @param explorationId
-     * @return
+     * @return ComCharactersDiscoveryClientVo And string
      */
     @PostMapping("updateState")
     @Decrypt
     @Encrypt
-    public Result<ComCharactersDiscoveryClientVo> updateState(@RequestParam(value = "userId") String userId,
+    public Result<?> updateState(@RequestParam(value = "userId") String userId,
                                                               @RequestParam(value = "explorationId") Integer explorationId,
                                                               @RequestParam(value = "isStop", defaultValue = "false") Boolean isStop) {
         try {
             //查看是否存在勘探数据
             ComCharactersDiscoveryVo discoveryVo = comCharactersDiscoveryService.getVo(explorationId);
             if (discoveryVo == null || !discoveryVo.getUserId().equals(userId)) {
-                return Result.of(null, false, ResultEnum.EXPLORATION_INFO_ERROR.getMessage(), ResultEnum.EXPLORATION_INFO_ERROR.getCode());
-            }
-            //开始工作时间 + 工作天数
-            Date endDate = DateUtil.offsetDay(discoveryVo.getWorkStart(), discoveryVo.getWorkDay());
-            //当前时间与结束时间的毫秒
-            Long dif = DateUtil.between(DateUtil.date(), endDate, DateUnit.MS);
-            if (dif > 0) {
-                //return Result.of(null, false, ResultEnum.EXPLORATION_TIME_ERROR.getMessage(), ResultEnum.EXPLORATION_TIME_ERROR.getCode());
+                throw new RuntimeException("勘探队伍不存在！");
             }
             //计算收益
-            return Result.of( comCharactersDiscoveryService.explorationState(discoveryVo,isStop));
+            return Result.of(comCharactersDiscoveryService.explorationState(discoveryVo, isStop));
+        } catch (AuthorizeException e) {
+            return Result.of(null, false, e.getMessage(), e.getCode());
         } catch (Exception e) {
-            return Result.of(null, false, ResultEnum.EXPLORATION_ERROR.getMessage(), ResultEnum.EXPLORATION_ERROR.getCode());
+            return Result.of(e.getMessage(), false, ResultEnum.EXPLORATION_ERROR);
         }
 
     }
 
-    @PostMapping("explorationComplete")
-    @Decrypt
-    @Encrypt
-    public Result<ComCharactersDiscoveryClientVo> explorationComplete(@RequestParam(value = "userId") String userId,
-                                                                      @RequestParam(value = "explorationId") Integer explorationId) {
-        try {
-            //查看是否存在勘探数据
-            ComCharactersDiscoveryVo discoveryVo = comCharactersDiscoveryService.getVo(explorationId);
-            if (discoveryVo == null || !discoveryVo.getUserId().equals(userId)) {
-                return Result.of(null, false, ResultEnum.EXPLORATION_INFO_ERROR.getMessage(), ResultEnum.EXPLORATION_INFO_ERROR.getCode());
-            }
-            //开始工作时间 + 工作天数
-            Date endDate = DateUtil.offsetDay(discoveryVo.getWorkStart(), discoveryVo.getWorkDay());
-            //当前时间与结束时间的毫秒
-            Long dif = DateUtil.between(DateUtil.date(), endDate, DateUnit.MS);
-            if (dif > 0) {
-                //return Result.of(null, false, ResultEnum.EXPLORATION_TIME_ERROR.getMessage(), ResultEnum.EXPLORATION_TIME_ERROR.getCode());
-            }
-            //计算收益
-            return Result.of( comCharactersDiscoveryService.explorationComplete(discoveryVo));
-        } catch (Exception e) {
-            return Result.of(null, false, ResultEnum.EXPLORATION_ERROR.getMessage(), ResultEnum.EXPLORATION_ERROR.getCode());
-        }
-
-    }
 }

src/main/java/com/td/WaDa/game/comcharactersdiscovery/pojo/ComCharactersDiscovery.java → src/main/java/com/td/Dawa/game/comcharactersdiscovery/pojo/ComCharactersDiscovery.java

@@ -1,8 +1,9 @@
-package com.td.WaDa.game.comcharactersdiscovery.pojo;
+package com.td.Dawa.game.comcharactersdiscovery.pojo;
 
 import lombok.Data;
 import javax.persistence.*;
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.util.Date;
 
 @Entity
@@ -25,7 +26,7 @@ public class ComCharactersDiscovery implements Serializable {
 
     private Date workStart;//开始时间
 
-    private Integer workDay;//探索期
+    private Integer workDay;//探索日期,记录毫秒,转成成工作日期。
 
     private String workFlag;//每次探索生成一个唯一标识
 
@@ -33,9 +34,13 @@ public class ComCharactersDiscovery implements Serializable {
 
     private Integer sceneId;//当前场景Id
 
-    private String rewardItem;
+    private String rewardItem; //记录奖励物品
 
-    private String rewardExp;
+    private String rewardCount; //记录奖励物品的数量 reward_item 奖励对应的数量 1000|2000
+
+    private Integer rewardExp; //记录奖励的经验
+
+    private String allItem; //全部产出的item记录
 
     private String note;//描述
 

src/main/java/com/td/WaDa/game/comcharactersdiscovery/repository/ComCharactersDiscoveryRepository.java → src/main/java/com/td/Dawa/game/comcharactersdiscovery/repository/ComCharactersDiscoveryRepository.java

@@ -1,7 +1,7 @@
-package com.td.WaDa.game.comcharactersdiscovery.repository;
+package com.td.Dawa.game.comcharactersdiscovery.repository;
 
-import com.td.WaDa.common.repository.*;
-import com.td.WaDa.game.comcharactersdiscovery.pojo.ComCharactersDiscovery;
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.comcharactersdiscovery.pojo.ComCharactersDiscovery;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;

src/main/java/com/td/Dawa/game/comcharactersdiscovery/service/ComCharactersDiscoveryService.java

@@ -0,0 +1,20 @@
+package com.td.Dawa.game.comcharactersdiscovery.service;
+
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.comcharactersdiscovery.pojo.ComCharactersDiscovery;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryClientVo;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryVo;
+
+public interface ComCharactersDiscoveryService extends CommonService<ComCharactersDiscoveryVo, ComCharactersDiscovery, Integer> {
+
+    ComCharactersDiscoveryVo startDiscover(String userId, Integer sceneId);
+
+    ComCharactersDiscoveryClientVo addDiscoverRole(ComCharactersVo charactersVo, Integer sceneId);
+
+    PageInfo<ComCharactersDiscoveryClientVo> findDiscoverClientVo(ComCharactersDiscoveryVo charactersDiscoveryVo);
+
+    ComCharactersDiscoveryClientVo explorationState(ComCharactersDiscoveryVo discoveryVo,Boolean isStop);
+
+}

src/main/java/com/td/Dawa/game/comcharactersdiscovery/service/ComCharactersDiscoveryServiceImpl.java

@@ -0,0 +1,726 @@
+package com.td.Dawa.game.comcharactersdiscovery.service;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.NumberUtil;
+import com.td.Dawa.common.pojo.PageInfo;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.config.enums.GameEnum;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.config.exception.AuthorizeException;
+import com.td.Dawa.game.comcharacters.pojo.ComCharacters;
+import com.td.Dawa.game.comcharacters.service.ComCharactersService;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersClientVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersVo;
+import com.td.Dawa.game.comcharactersdiscovery.pojo.ComCharactersDiscovery;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryClientVo;
+import com.td.Dawa.game.comcharactersdiscovery.vo.ComCharactersDiscoveryVo;
+import com.td.Dawa.game.comcharactersdiscovery.repository.ComCharactersDiscoveryRepository;
+import com.td.Dawa.game.complayers.service.ComPlayersService;
+import com.td.Dawa.game.complayersattri.service.ComPlayersAttriService;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriClientVo;
+import com.td.Dawa.game.complayersattri.vo.ComPlayersAttriVo;
+import com.td.Dawa.game.excelcharacterlevel.service.ExcelCharacterLevelService;
+import com.td.Dawa.game.excelcharacterlevel.vo.ExcelCharacterLevelVo;
+import com.td.Dawa.game.exceldrop.pojo.ExcelDrop;
+import com.td.Dawa.game.exceldrop.service.ExcelDropService;
+import com.td.Dawa.game.exceldrop.vo.ExcelDropClientVo;
+import com.td.Dawa.game.excelparameter.service.ExcelParameterService;
+import com.td.Dawa.game.excelparameter.vo.ExcelParameterVo;
+import com.td.Dawa.game.excelscene.pojo.ExcelScene;
+import com.td.Dawa.game.excelscene.service.ExcelSceneService;
+import com.td.Dawa.util.CopyUtil;
+import com.td.Dawa.util.UUIDUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.math.BigInteger;
+import java.util.*;
+
+@Service
+@Transactional
+@Slf4j
+public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComCharactersDiscoveryVo, ComCharactersDiscovery, Integer> implements ComCharactersDiscoveryService {
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private ComCharactersDiscoveryRepository comCharactersDiscoveryRepository;
+
+    @Autowired
+    private ComCharactersService comCharactersService;
+
+    @Autowired
+    private ExcelDropService excelDropService;
+
+    @Autowired
+    private ExcelSceneService excelSceneService;
+
+    @Autowired
+    private ExcelCharacterLevelService excelCharacterLevelService;
+
+    @Autowired
+    private ComPlayersAttriService comPlayersAttriService;
+
+    @Autowired
+    private ExcelParameterService excelParameterService;
+
+    /**
+     * 开始工作
+     *
+     * @param userId
+     * @param sceneId
+     * @return
+     */
+    @Override
+    public ComCharactersDiscoveryVo startDiscover(String userId, Integer sceneId) {
+
+        ComCharactersDiscovery comCharacterDiscovery =
+                comCharactersDiscoveryRepository.findByUserIdAndSceneId(userId, sceneId).orElse(null);
+        if (comCharacterDiscovery == null || !StringUtils.hasText(comCharacterDiscovery.getRoleId())) {
+            throw new AuthorizeException(ResultEnum.EXPLORATION_INFO_NULL);
+        } else {
+            if (comCharacterDiscovery.getIsWork().equals(GameEnum.WORK_ING.getValue())) {
+                throw new AuthorizeException(ResultEnum.EXPLORATION_ING);
+            }
+            if (comCharacterDiscovery.getIsWork().equals(GameEnum.WORK_COMPLETE.getValue())) {
+                throw new AuthorizeException(ResultEnum.EXPLORATION_COMPLETE);
+            }
+            //设置工作状态，设置工作开始时间
+            comCharacterDiscovery.setIsWork(GameEnum.WORK_ING.getValue());
+            comCharacterDiscovery.setWorkStart(DateUtil.date());
+
+            ExcelParameterVo maxStrength = excelParameterService.getVo(1);
+            ExcelParameterVo workConsumesStrength = excelParameterService.getVo(2); //消耗的体力单位
+            if (maxStrength == null || workConsumesStrength == null) {
+                throw new AuthorizeException(ResultEnum.SETTING_IS_NULL);
+            }
+            //todo 扣除一个体力值,判断是否超过设置的体力值
+            ComPlayersAttriVo attriVo = comPlayersAttriService.findByUserId(userId);
+            Integer _strength = attriVo.getStrength() + workConsumesStrength.getValue().intValue();
+            if (maxStrength.getValue().intValue() < _strength) {
+                //假如设置的值小于当前计算的体力，返回提示 当前体力不足，队伍无法工作
+                throw new AuthorizeException(ResultEnum.PLAYER_ATTRIBUTE_STRENGTH_IS_NOT);
+            }
+            //消耗一个体力值(+1)
+            attriVo.setStrength(_strength);
+            comPlayersAttriService.save(attriVo);
+        }
+        ComCharactersDiscoveryVo comCharacterDiscoveryVo = CopyUtil.copy(comCharacterDiscovery, ComCharactersDiscoveryVo.class);
+        //存储并且返回
+        return super.save(comCharacterDiscoveryVo).getData();
+    }
+
+    /**
+     * 添加角色
+     *
+     * @param charactersVo
+     * @param sceneId
+     * @return
+     */
+    @Override
+    public ComCharactersDiscoveryClientVo addDiscoverRole(ComCharactersVo charactersVo, Integer sceneId) {
+
+        //角色list
+        List<ComCharactersClientVo> comCharactersClientVos = new ArrayList<>();
+        ComCharactersDiscovery comCharacterDiscovery =
+                comCharactersDiscoveryRepository.findByUserIdAndSceneId(charactersVo.getUserId(), sceneId).orElse(null);
+        if (comCharacterDiscovery == null) {
+            comCharacterDiscovery = new ComCharactersDiscovery();
+            //新建一个队伍
+            comCharacterDiscovery.setUserId(charactersVo.getUserId());
+            comCharacterDiscovery.setRoleId(charactersVo.getId().toString());
+            //comCharacterDiscovery.setName();
+            comCharacterDiscovery.setIsWork(GameEnum.WORK_NOT_STARTED.getValue());//默认不工作
+            comCharacterDiscovery.setWorkStart(DateUtil.date());
+            ExcelParameterVo workMill = excelParameterService.getVo(6); //初始化工作时长
+            comCharacterDiscovery.setWorkDay(workMill.getValue().intValue()); //工作时间，todo 暂时定60s
+            comCharacterDiscovery.setWorkFlag(UUIDUtil.getUUID());
+            comCharacterDiscovery.setDiscoverLevel(1); //默认探索第一层场景
+            comCharacterDiscovery.setSceneId(sceneId); // 比如矿洞id对应的入口是201
+            comCharacterDiscovery.setRewardExp(0); // 默认不奖励经验
+            comCharacterDiscovery.setNote("工作队伍");
+
+            comCharacterDiscovery.setCreateTime(DateUtil.date());
+            comCharacterDiscovery.setUpdateTime(DateUtil.date());
+
+            //没有角色，即把传入角色添加上
+            comCharactersClientVos.add(CopyUtil.copy(charactersVo, ComCharactersClientVo.class));
+
+
+        } else {
+            String[] roleId = comCharacterDiscovery.getRoleId().split("\\|");
+            Boolean isReplace = false; //是否是替换角色
+            for (int i = 0; i < roleId.length; i++) {
+                if (roleId[i].equals(charactersVo.getId().toString())) {
+                    //不能添加相同的角色,直接返回一个查询的
+                    //return CopyUtil.copy(comCharacterDiscovery, ComCharactersDiscoveryVo.class);
+                    throw new AuthorizeException(ResultEnum.ROLE_ALREADY_ADD);
+                } else {
+                    ComCharactersVo _findCharacter = comCharactersService.getVo(Integer.parseInt(roleId[i]));
+                    //如果当前职业相同，直接替换id
+                    //log.info(_findCharacter.getProfessional() + "=" + charactersVo.getProfessional());
+                    //列表角色和传入的角色做对比
+                    if (_findCharacter.getProfessional().equals(charactersVo.getProfessional())) {
+                        //如职业一样，替换列表中的角色
+                        roleId[i] = charactersVo.getId().toString();
+                        isReplace = true;
+                        comCharactersClientVos.add(CopyUtil.copy(charactersVo, ComCharactersClientVo.class));
+                    } else {
+                        comCharactersClientVos.add(CopyUtil.copy(_findCharacter, ComCharactersClientVo.class));
+                    }
+
+                }
+            }
+            //如果不是替换，再旧的基础上添加一个角色
+            if (!isReplace) {
+                String _roleId = comCharacterDiscovery.getRoleId() + "|" + charactersVo.getId().toString();
+                //如果最后没有替换到列表，说明没有角色，即把传入角色添加上
+                comCharactersClientVos.add(CopyUtil.copy(charactersVo, ComCharactersClientVo.class));
+                comCharacterDiscovery.setRoleId(_roleId);
+            } else {
+                comCharacterDiscovery.setRoleId(String.join("|", roleId));
+            }
+            comCharacterDiscovery.setUpdateTime(DateUtil.date());
+        }
+        ComCharactersDiscoveryVo comCharacterDiscoveryVo = CopyUtil.copy(comCharacterDiscovery, ComCharactersDiscoveryVo.class);
+        super.save(comCharacterDiscoveryVo);
+        ComCharactersDiscoveryClientVo comCharacterDiscoveryClientVo = CopyUtil.copy(comCharacterDiscoveryVo, ComCharactersDiscoveryClientVo.class);
+        comCharacterDiscoveryClientVo.setSubCharacters(comCharactersClientVos);
+        //设置携带属性
+        comCharacterDiscoveryClientVo = setDiscoveryClientVoProAndTransNum(comCharacterDiscoveryClientVo);
+        return comCharacterDiscoveryClientVo;
+    }
+
+
+    @Override
+    public PageInfo<ComCharactersDiscoveryClientVo> findDiscoverClientVo(ComCharactersDiscoveryVo characterDiscoveryVo) {
+        PageInfo<ComCharactersDiscoveryVo> comCharactersDiscoveryVo = super.page(characterDiscoveryVo).getData();
+        //获取到探索队伍的数据
+        List<ComCharactersDiscoveryVo> _listVo = comCharactersDiscoveryVo.getRows();
+        List<ComCharactersDiscoveryClientVo> _discoveryClientVos = new ArrayList<>();
+        for (ComCharactersDiscoveryVo discoveryVo : _listVo) {
+            String[] roleId = discoveryVo.getRoleId().split("\\|");
+            //角色list
+            List<ComCharactersClientVo> comCharactersClientVos = new ArrayList<>();
+            for (int i = 0; i < roleId.length; i++) {
+                ComCharactersVo comCharactersVo = comCharactersService.getVo(Integer.parseInt(roleId[i]));
+                ComCharactersClientVo comCharactersClientVo = CopyUtil.copy(comCharactersVo, ComCharactersClientVo.class);
+                //List<ExcelCharacterCreate> subExcelCharacterList = listMap.get(excelCharacterAttr.getRoleType());
+                //character.setSubCreateClientList(CopyUtil.copyList(subExcelCharacterList,ExcelCharacterCreateClientVo.class));
+                comCharactersClientVos.add(comCharactersClientVo);
+            }
+            //开始工作时间 + 工作天数
+            Date endDate = DateUtil.offsetMillisecond(discoveryVo.getWorkStart(), discoveryVo.getWorkDay());
+            //当前时间与结束时间的毫秒
+            Long dif = DateUtil.between(DateUtil.date(), endDate, DateUnit.MS, false);
+            if (dif <= 0L) {
+                //工作完成
+                discoveryVo.setIsWork(GameEnum.WORK_COMPLETE.getValue());
+                super.save(discoveryVo);
+                dif = 0L;
+            }
+            ComCharactersDiscoveryClientVo comCharacterDiscoveryClientVo = CopyUtil.copy(discoveryVo, ComCharactersDiscoveryClientVo.class);
+            //小于等于零即完成
+            comCharacterDiscoveryClientVo.setWorkMill(dif);
+            comCharacterDiscoveryClientVo.setSubCharacters(comCharactersClientVos);
+            //设置携带属性
+            comCharacterDiscoveryClientVo = setDiscoveryClientVoProAndTransNum(comCharacterDiscoveryClientVo);
+            _discoveryClientVos.add(comCharacterDiscoveryClientVo);
+        }
+
+        PageInfo<ComCharactersDiscoveryClientVo> backPageInfo = new PageInfo<>();
+        backPageInfo.setRows(_discoveryClientVos);
+        backPageInfo.setPage(comCharactersDiscoveryVo.getPage());
+        backPageInfo.setPageSize(comCharactersDiscoveryVo.getPageSize());
+        backPageInfo.setTotal(comCharactersDiscoveryVo.getTotal());
+        backPageInfo.setRecords(comCharactersDiscoveryVo.getRecords());
+        backPageInfo.setSidx(comCharactersDiscoveryVo.getSidx());
+        backPageInfo.setSord(comCharactersDiscoveryVo.getSord());
+        return backPageInfo;
+    }
+
+    /**
+     * 挖矿工作状态
+     * 1.工作时间未完结时候，刷新按照最后一次updateTime来判定是否重新计算产出，假如挖矿和勘探分别有不同的时间
+     * 2.工作未完结时间，记录当前产出的物品和产出m
+     * 3.工作完结，删除工作队列，相关产出转移背包，计算经验等。（todo 删除的队列进入回收列表）
+     * 4.可中途结束工作
+     *
+     * @param discoveryVo
+     * @return
+     */
+    @Override
+    public ComCharactersDiscoveryClientVo explorationState(ComCharactersDiscoveryVo discoveryVo, Boolean isStop) {
+        if (discoveryVo.getIsWork().equals(GameEnum.WORK_NOT_STARTED.getValue())) {
+            throw new AuthorizeException(ResultEnum.EXPLORATION_NOT_START);
+        }
+        //todo 经验如何设置
+        List<ExcelParameterVo> parameterVos = excelParameterService.list(new ExcelParameterVo()).getData();
+        ExcelParameterVo parameter = parameterVos.get(6); //初始化工作经验
+        Integer outExp = parameter.getValue().intValue();
+
+        //todo 获取当前人物等级经验表，待优化
+        List<ExcelCharacterLevelVo> excelCharacterLevelVo = excelCharacterLevelService.list(new ExcelCharacterLevelVo()).getData();
+        //已产生的奖励物品
+        String[] _hasDropIds = StringUtils.hasText(discoveryVo.getRewardItem()) ? discoveryVo.getRewardItem().split("\\|") : new String[0];
+        //奖励物品的计数
+        String[] _hasDropCounts = StringUtils.hasText(discoveryVo.getRewardCount()) ? discoveryVo.getRewardCount().split("\\|") : new String[0];
+        //奖励物品的计数
+        String[] _allDropIds = StringUtils.hasText(discoveryVo.getRewardCount()) ? discoveryVo.getAllItem().split("\\|") : new String[0];
+        //记录当前的产出奖励
+        List<ExcelDropClientVo> outExcelDrops = new ArrayList<>();
+
+        //开始工作时间 + 工作天数
+        Date endDate = DateUtil.offsetMillisecond(discoveryVo.getWorkStart(), discoveryVo.getWorkDay());
+        //用更新数据时间与最终偏移时间点来计算 当前的秒数，为零说明工作完成
+        Long difSecond = DateUtil.between(discoveryVo.getUpdateTime(), endDate, DateUnit.SECOND, false);
+        if (difSecond <= 0L) {
+            difSecond = 0L;//这里difSecond是用户更新数据计算所剩余的时间
+        }
+        log.info("剩余计算的时长difSecond：" + difSecond);
+        //当前时间与结束时间的毫秒
+        Long dif = DateUtil.between(DateUtil.date(), endDate, DateUnit.MS, false);
+
+        //判断是否结束工作 小于等于零即完成
+        if (dif <= 0L) {
+            discoveryVo.setIsWork(GameEnum.WORK_COMPLETE.getValue());
+            dif = 0L;
+        } else if (isStop) {
+            //工作时长未完结，不可停止
+            throw new AuthorizeException(ResultEnum.EXPLORATION_NOT_STOP);
+        }
+
+        //todo 根据场景id获取当前场景配置 后面处理缓存，提高速度
+        //主场景id
+        ExcelScene excelScene = excelSceneService.findBySceneId(discoveryVo.getSceneId());
+        if (!StringUtils.hasText(excelScene.getSceneEvent())) {
+            throw new RuntimeException("scene event 奖励未配置");
+        }
+        //获取当前的一个基础数量
+        Integer outTransUpperLimit = excelScene.getAmount();
+
+        //当前场景层级对应的物品
+        String[] _dropIds = excelScene.getSceneEvent().split("\\|");
+        List<ExcelDrop> excelDrops = excelDropService.getListByDropIds(Convert.toIntArray(_dropIds));
+        //List<ExcelDropClientVo> dropClientVos = CopyUtil.copyList(excelDrops, ExcelDropClientVo.class);
+        List<ExcelDropClientVo> dropClientVos = new ArrayList<>(); // 这里返回的是挖取出来的物品
+
+        //todo 添加已经有的物品信息
+        for (int i = 0; i < _allDropIds.length; i++) {
+            if (ArrayUtil.contains(_dropIds, _allDropIds[i])) {
+                int _index = ArrayUtil.indexOf(_dropIds, _allDropIds[i]);
+                ExcelDrop _clientVo = excelDrops.get(_index);
+                ExcelDropClientVo dropClientVo = CopyUtil.copy(_clientVo, ExcelDropClientVo.class);
+                dropClientVo.setCount(0);
+                dropClientVos.add(dropClientVo);
+            }
+        }
+        for (int i = 0; i < _hasDropIds.length; i++) {
+            if (ArrayUtil.contains(_dropIds, _hasDropIds[i])) {
+                int _index = ArrayUtil.indexOf(_dropIds, _hasDropIds[i]);
+                ExcelDrop _clientVo = excelDrops.get(_index);
+                ExcelDropClientVo dropClientVo = CopyUtil.copy(_clientVo, ExcelDropClientVo.class);
+                int _dropCount = Integer.parseInt(ArrayUtil.get(_hasDropCounts, i));//根据id获取记录的count
+                dropClientVo.setCount(_dropCount);
+                outExcelDrops.add(dropClientVo);
+            }
+        }
+
+        //当前探索队伍
+        String[] roleId = discoveryVo.getRoleId().split("\\|");
+        Integer[] _roleIds = Convert.toIntArray(roleId);
+
+        //角色list
+        List<ComCharactersClientVo> comCharactersClientVos = new ArrayList<>();
+
+        //先找出三个职业对象
+        ComCharactersVo powerChar = null, intelliChar = null, skillChar = null;
+        List<ComCharacters> characters = comCharactersService.findByRoleIdIn(_roleIds);
+        //设置一个默认的基础数量
+        for (int i = 0; i < characters.size(); i++) {
+            ComCharactersVo comCharactersVo = CopyUtil.copy(characters.get(i), ComCharactersVo.class); //comCharactersService.getVo(Integer.parseInt(roleId[i]));
+            //根据当前角色的职业计算
+            Integer _professional = Integer.parseInt(comCharactersVo.getProfessional());
+            if (_professional.equals(GameEnum.PRO_SKIlLS.getValue())) {
+                //运输工
+                skillChar = comCharactersVo;
+                //计算当前运输格数，即获取到物品的上限
+                //场景的最低运输数量
+                Integer _selfLimit = getLimitSkills(comCharactersVo.getSkills());
+                if (_selfLimit > outTransUpperLimit) {
+                    outTransUpperLimit = _selfLimit;
+                }
+            } else if (_professional.equals(GameEnum.PRO_POWER.getValue())) {
+                //矿工
+                powerChar = comCharactersVo;
+            } else if (_professional.equals(GameEnum.PRO_INTELLIGENCE.getValue())) {
+                //勘测地形
+                intelliChar = comCharactersVo;
+            }
+
+        }
+        if (powerChar != null) {
+            //  每3秒执行一次挖矿动作。根据属性数值概率，获得收益
+            //  矿工有休息动作，休息时间3秒
+            // 勘探：
+            Integer _power = powerChar.getPower();
+            int _miningInterval = parameterVos.get(3).getValue().intValue();//挖矿时间间隔
+            log.info("挖矿间隔时间：" + _miningInterval);
+            int _count = (int) Math.floor(difSecond / _miningInterval); // 一共执行的工作次数和休息
+            log.info("执行的工作次数：" + _count);
+            //按次数执行奖励
+            //对应物品数量少于或等于运输数量
+            for (int j = 0; j < _count; j++) {
+                //采集x4+休息x1
+                if (j % 5 != 0) {
+                    //工作，并且奖励物品
+                    if (NumberUtil.compare(new Random().nextDouble(), getRatioByPower(_power)) > 0) {
+                        int index = (int) (Math.random() * excelDrops.size());
+                        ExcelDrop _clientVo = excelDrops.get(index);
+                        //
+                        {
+                            //todo 如果挖了多少个，添加上去
+                            if (ArrayUtil.contains(_hasDropIds, _clientVo.getId().toString())) {
+                                //已经存在的下标
+                                int _index = ArrayUtil.indexOf(_hasDropIds, _clientVo.getId().toString());
+                                int _dropCount = Integer.parseInt(ArrayUtil.get(_hasDropCounts, _index));//根据id获取记录的count
+                                _dropCount = _dropCount + 1;
+                                _hasDropCounts = ArrayUtil.setOrAppend(_hasDropCounts, _index, _dropCount + "");//添加1个数量
+                                //重新设置count+1
+                                ExcelDropClientVo dropClientVo = outExcelDrops.get(_index);
+                                dropClientVo.setCount(_dropCount);
+                            } else if (outExcelDrops.size() < outTransUpperLimit) {
+                                _hasDropIds = ArrayUtil.append(_hasDropIds, _clientVo.getId().toString());
+                                _hasDropCounts = ArrayUtil.append(_hasDropCounts, "1");//新添加
+                                outExcelDrops.add(CopyUtil.copy(_clientVo, ExcelDropClientVo.class));
+                            }
+                        }
+
+                        if (!ArrayUtil.contains(_allDropIds, _clientVo.getId().toString())) {
+                            //如果没添加过，添加一次物品
+                            _allDropIds = ArrayUtil.append(_allDropIds, _clientVo.getId().toString());
+                            ExcelDropClientVo dropClientVo = CopyUtil.copy(_clientVo, ExcelDropClientVo.class);
+                            dropClientVo.setCount(0);
+                            dropClientVos.add(dropClientVo);
+                        }
+
+                    }
+                }
+            }
+
+            //完结后三个分别增加经验
+            //收获经验 todo 处理人物升级等
+            ComCharactersClientVo comCharactersClientVo = upgradeComCharactersVo(powerChar, excelCharacterLevelVo, outExp);
+            comCharactersClientVos.add(comCharactersClientVo);
+        }
+        if (intelliChar != null) {
+            //勘测地形，用于进入下层场景的职业
+            //每15秒执行一次勘探。根据属性数值概率，前往下层洞穴
+            //洞穴影响矿石类型产出,最后一层不用再计算概率
+            if (!discoveryVo.getDiscoverLevel().equals(GameEnum.LIMIT_LEVEL.getValue())) {
+                Integer _intelligence = intelliChar.getIntelligence();
+                int _explorationInterval = parameterVos.get(4).getValue().intValue();//挖矿时间间隔
+                log.info("勘探间隔时间：" + _explorationInterval);
+                int _count = (int) Math.floor(difSecond / _explorationInterval); // 一共执行勘探的次数
+                //按次数执行奖励
+                for (int j = 0; j < _count; j++) {
+                    //如果等于最后一层，返回
+                    if (discoveryVo.getDiscoverLevel().equals(GameEnum.LIMIT_LEVEL.getValue())) {
+                        break;
+                    }
+                    //计算是否进入下一层的概率
+                    double _nextRatio = gotoNextSceneRatio(discoveryVo.getDiscoverLevel(), _intelligence);
+                    if (NumberUtil.compare(new Random().nextDouble(), _nextRatio) > 0) {
+                        //todo 切换关卡的奖励物品
+                        Integer _currentLevel = discoveryVo.getDiscoverLevel() + 1;
+                        discoveryVo.setDiscoverLevel(_currentLevel);
+                        super.save(discoveryVo); // 更新数据
+                        //切换场景id
+                        int _levelId = getSceneIdByLevel(_currentLevel, discoveryVo.getSceneId());
+                        if (_levelId != 0) {
+                            //切换逻辑后，重新设置奖励列表
+                            excelScene = excelSceneService.findBySceneId(_levelId);
+                            if (StringUtils.hasText(excelScene.getSceneEvent())) {
+                                _dropIds = excelScene.getSceneEvent().split("\\|");
+                                excelDrops = excelDropService.getListByDropIds(Convert.toIntArray(_dropIds));
+                                dropClientVos = CopyUtil.copyList(excelDrops, ExcelDropClientVo.class);
+                            } else {
+                                throw new RuntimeException("scene event 奖励未配置");
+                            }
+
+                        }
+                    }
+                }
+            }
+            //完结后三个分别增加经验
+            //收获经验 todo 处理人物升级等
+            ComCharactersClientVo comCharactersClientVo = upgradeComCharactersVo(intelliChar, excelCharacterLevelVo, outExp);
+            comCharactersClientVos.add(comCharactersClientVo);
+        }
+        if (skillChar != null) {
+            //完结后三个分别增加经验
+            //收获经验 todo 处理人物升级等
+            ComCharactersClientVo comCharactersClientVo = upgradeComCharactersVo(skillChar, excelCharacterLevelVo, outExp);
+            comCharactersClientVos.add(comCharactersClientVo);
+        }
+        ComCharactersDiscoveryClientVo discoveryClientVo = CopyUtil.copy(discoveryVo, ComCharactersDiscoveryClientVo.class);
+        discoveryClientVo.setSubCharacters(comCharactersClientVos);//当前职业
+        discoveryClientVo.setWorkMill(dif);//倒计时
+        //List<ExcelDropClientVo> _getDrops = outExcelDrops.subList(0, outTransUpperLimit);
+        //记录一个物品获得情况
+        //List<String> _getDropIds = _getDrops.stream().map(e -> e.getId().toString()).collect(Collectors.toList());
+        String _rewardItem = String.join("|", _hasDropIds);
+        String _rewardCounts = String.join("|", _hasDropCounts);
+        String _allItems = String.join("|", _allDropIds);
+        discoveryVo.setRewardItem(_rewardItem);
+        discoveryVo.setRewardCount(_rewardCounts);
+        discoveryVo.setAllItem(_allItems);
+
+        //保存挖矿数据
+        //设置一次updateTime
+        discoveryVo.setUpdateTime(DateUtil.date());
+        //todo 工作完成后，isStop
+        if (discoveryVo.getIsWork().equals(GameEnum.WORK_COMPLETE.getValue()) && isStop) {
+            super.delete(discoveryVo.getId());
+        } else {
+            //todo 后续优化，不用每次都存储
+            super.save(discoveryVo);
+        }
+        //输出限制
+        discoveryClientVo.setSubGetDrops(outExcelDrops);//当前产出物品
+        //全部的奖励物品
+        discoveryClientVo.setSubAllDrops(dropClientVos);
+
+        //设置携带属性
+        discoveryClientVo = setDiscoveryClientVoProAndTransNum(discoveryClientVo);
+        return discoveryClientVo;
+    }
+
+    /**
+     * 存储
+     *
+     * @param comCharactersVo
+     */
+    private ComCharactersClientVo upgradeComCharactersVo(ComCharactersVo comCharactersVo, List<ExcelCharacterLevelVo> excelCharacterLevelVo, Integer outExp) {
+        if (comCharactersVo.getExp() == null) {
+            throw new RuntimeException("upgrade characters exp is null！");
+        }
+        if (comCharactersVo.getLevel() == null) {
+            throw new RuntimeException("upgrade characters level is null！");
+        }
+        Integer _exp = comCharactersVo.getExp() + outExp;
+        Integer _level = comCharactersVo.getLevel(); // 这里等级至少是1级
+
+        Integer final_level = _level;
+        ExcelCharacterLevelVo characterLevelVo = excelCharacterLevelVo.stream().filter(e -> e.getId().equals(final_level)).findFirst().get();
+
+
+        while (_exp > characterLevelVo.getExp()) {
+            _exp -= characterLevelVo.getExp();
+            _level += 1;//提升一级
+            Integer final_level2 = _level;
+            characterLevelVo = excelCharacterLevelVo.stream().filter(e -> e.getId().equals(final_level2)).findFirst().get();
+        }
+        //最后的等级和经验
+        comCharactersVo.setLevel(_level);
+        comCharactersVo.setExp(_exp);
+        //存储一次
+        comCharactersService.save(comCharactersVo);
+        ComCharactersClientVo comCharactersClientVo = CopyUtil.copy(comCharactersVo, ComCharactersClientVo.class);
+        //返回当前需要升级的经验
+        comCharactersClientVo.setLevelUpExp(characterLevelVo.getExp());
+        return comCharactersClientVo;
+    }
+
+
+    /**
+     * 设置discoveryClientVo带的两个概率和一个运输数量
+     *
+     * @param clientVo
+     * @return
+     */
+    private ComCharactersDiscoveryClientVo setDiscoveryClientVoProAndTransNum(ComCharactersDiscoveryClientVo clientVo) {
+        //主场景id
+        ExcelScene excelScene = excelSceneService.findBySceneId(clientVo.getSceneId());
+        if (excelScene.getAmount() == null) {
+            throw new RuntimeException("excelScene amount is null");
+        }
+        Integer outTransUpperLimit = excelScene.getAmount();
+        clientVo.setTransQuantity(outTransUpperLimit);
+
+        List<ComCharactersClientVo> voList = clientVo.getSubCharacters();
+        for (int i = 0; i < clientVo.getSubCharacters().size(); i++) {
+            ComCharactersClientVo charactersClientVo = voList.get(i);
+            Integer _professional = Integer.parseInt(charactersClientVo.getProfessional());
+            if (_professional.equals(GameEnum.PRO_SKIlLS.getValue())) {
+                //运输工
+                //计算当前运输格数，即获取到物品的上限
+                //场景的最低运输数量
+                Integer _selfLimit = getLimitSkills(charactersClientVo.getSkills());
+                if (_selfLimit > outTransUpperLimit) {
+                    clientVo.setTransQuantity(_selfLimit);
+                }
+            } else if (_professional.equals(GameEnum.PRO_POWER.getValue())) {
+                //矿工
+                clientVo.setPowerPro(getRatioByPower(charactersClientVo.getPower()));
+            } else if (_professional.equals(GameEnum.PRO_INTELLIGENCE.getValue())) {
+                //勘测地形
+                clientVo.setIntelliPro(gotoNextSceneRatio(clientVo.getDiscoverLevel(), charactersClientVo.getIntelligence()));
+            }
+        }
+        return clientVo;
+    }
+
+    private double getRatioByPower(Integer value) {
+        double _ratio = 0d;
+        if (value >= GameEnum.ATTRIBUTE_01.getValue() && value < GameEnum.ATTRIBUTE_02.getValue()) {
+            //60~100
+            _ratio = 0.004;
+        } else if (value < GameEnum.ATTRIBUTE_03.getValue()) {
+            //100~140
+            _ratio = 0.006;
+        } else if (value < GameEnum.ATTRIBUTE_04.getValue()) {
+            //140~180
+            _ratio = 0.01;
+        } else if (value < GameEnum.ATTRIBUTE_05.getValue()) {
+            //180~220
+            _ratio = 0.015;
+        } else if (value < GameEnum.ATTRIBUTE_06.getValue()) {
+            //220~260
+            _ratio = 0.02;
+        } else {
+            //>=260
+            _ratio = 0.025;
+        }
+        return _ratio;
+    }
+
+    /**
+     * 根据当前场景的层级和属性值获取一个进入下个场景的概率
+     *
+     * @param sceneLevel
+     * @param value
+     * @return
+     */
+    private double gotoNextSceneRatio(Integer sceneLevel, Integer value) {
+        double _ratio = 0d;
+        if (value >= GameEnum.ATTRIBUTE_01.getValue() && value < GameEnum.ATTRIBUTE_02.getValue()) {
+            //60~100
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.04;  // 1=>2
+            }
+        } else if (value < GameEnum.ATTRIBUTE_03.getValue()) {
+            //100~140
+            _ratio = 0.006;
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.11;  // 1=>2
+            } else if (sceneLevel.equals(2)) {
+                _ratio = 0.1;  // 2=>3
+            }
+        } else if (value < GameEnum.ATTRIBUTE_04.getValue()) {
+            //140~180
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.23;  // 1=>2
+            } else if (sceneLevel.equals(2)) {
+                _ratio = 0.03;  // 2=>3
+            } else if (sceneLevel.equals(3)) {
+                _ratio = 0.01;  // 3=>4
+            }
+        } else if (value < GameEnum.ATTRIBUTE_05.getValue()) {
+            //180~220
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.34;  // 1=>2
+            } else if (sceneLevel.equals(2)) {
+                _ratio = 0.07;  // 2=>3
+            } else if (sceneLevel.equals(3)) {
+                _ratio = 0.03;  // 3=>4
+            }
+        } else if (value < GameEnum.ATTRIBUTE_06.getValue()) {
+            //220~260
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.51;  // 1=>2
+            } else if (sceneLevel.equals(2)) {
+                _ratio = 0.11;  // 2=>3
+            } else if (sceneLevel.equals(3)) {
+                _ratio = 0.07;  // 3=>4
+            }
+        } else {
+            //>=260
+            if (sceneLevel.equals(1)) {
+                _ratio = 0.97;  // 1=>2
+            } else if (sceneLevel.equals(2)) {
+                _ratio = 0.19;  // 2=>3
+            } else if (sceneLevel.equals(3)) {
+                _ratio = 0.13;  // 3=>4
+            }
+        }
+        return _ratio;
+    }
+
+
+    private int getLimitSkills(Integer value) {
+        int _limit = 0;
+        if (value >= GameEnum.ATTRIBUTE_01.getValue() && value < GameEnum.ATTRIBUTE_02.getValue()) {
+            //60~100
+            _limit = 5;
+        } else if (value < GameEnum.ATTRIBUTE_03.getValue()) {
+            //100~140
+            _limit = 10;
+        } else if (value < GameEnum.ATTRIBUTE_04.getValue()) {
+            //140~180
+            _limit = 15;
+        } else if (value < GameEnum.ATTRIBUTE_05.getValue()) {
+            //180~220
+            _limit = 20;
+        } else if (value < GameEnum.ATTRIBUTE_06.getValue()) {
+            //220~260
+            _limit = 25;
+        } else {
+            //>=260
+            _limit = 30;
+        }
+        return _limit;
+    }
+
+
+    private int getSceneIdByLevel(Integer value, Integer sceneType) {
+        int _levelId = 0;
+        if (sceneType >= 101 || sceneType <= 105) {
+            if (value.equals(1)) {
+                _levelId = GameEnum.LUMBERING_00.getValue();
+            } else if (value.equals(2)) {
+                _levelId = GameEnum.LUMBERING_01.getValue();
+            } else if (value.equals(3)) {
+                _levelId = GameEnum.LUMBERING_02.getValue();
+            } else if (value.equals(4)) {
+                _levelId = GameEnum.LUMBERING_03.getValue();
+            } else if (value.equals(5)) {
+                _levelId = GameEnum.LUMBERING_04.getValue();
+            }
+            //伐木
+        } else if (sceneType >= 201 || sceneType <= 205) {
+            if (value.equals(1)) {
+                _levelId = GameEnum.MINE_00.getValue();
+            } else if (value.equals(2)) {
+                _levelId = GameEnum.MINE_01.getValue();
+            } else if (value.equals(3)) {
+                _levelId = GameEnum.MINE_02.getValue();
+            } else if (value.equals(4)) {
+                _levelId = GameEnum.MINE_03.getValue();
+            } else if (value.equals(5)) {
+                _levelId = GameEnum.MINE_04.getValue();
+            }
+        }
+
+        return _levelId;
+    }
+}

src/main/java/com/td/WaDa/game/comcharactersdiscovery/vo/ComCharactersDiscoveryClientVo.java → src/main/java/com/td/Dawa/game/comcharactersdiscovery/vo/ComCharactersDiscoveryClientVo.java

@@ -1,10 +1,11 @@
-package com.td.WaDa.game.comcharactersdiscovery.vo;
+package com.td.Dawa.game.comcharactersdiscovery.vo;
 
-import com.td.WaDa.game.comcharacters.vo.ComCharactersClientVo;
-import com.td.WaDa.game.exceldrop.vo.ExcelDropClientVo;
+import com.td.Dawa.game.comcharacters.vo.ComCharactersClientVo;
+import com.td.Dawa.game.exceldrop.vo.ExcelDropClientVo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
 
@@ -24,7 +25,7 @@ public class ComCharactersDiscoveryClientVo implements Serializable {
 
     private Date workStart;//开始时间
 
-    private Integer workDay;//探索期
+    private Integer workDay;//探索日期,记录毫秒,转成成工作日期。
 
     private Long workMill;//返回一个探索剩余时间毫秒
 
@@ -34,9 +35,19 @@ public class ComCharactersDiscoveryClientVo implements Serializable {
 
     private Integer sceneId;//当前场景Id
 
-    private String rewardItem;
+    //private String rewardItem; //记录奖励物品
 
-    private String rewardExp;
+    //private String rewardCount; //记录奖励物品的数量 reward_item 奖励对应的数量 1000|2000
+
+    private Integer rewardExp; //记录奖励的经验
+
+    //private String allItem; //全部产出的item记录
+
+    private Double powerPro;//产出概率
+
+    private Double intelliPro;//勘探概率
+
+    private Integer transQuantity;//当前运输数量
 
     private String note;//描述
 

src/main/java/com/td/WaDa/game/comcharactersdiscovery/vo/ComCharactersDiscoverySimpleVo.java → src/main/java/com/td/Dawa/game/comcharactersdiscovery/vo/ComCharactersDiscoverySimpleVo.java

@@ -1,7 +1,8 @@
-package com.td.WaDa.game.comcharactersdiscovery.vo;
+package com.td.Dawa.game.comcharactersdiscovery.vo;
 
 import lombok.Data;
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.util.Date;
 
 @Data
@@ -20,7 +21,7 @@ public class ComCharactersDiscoverySimpleVo implements Serializable {
 
     private Date workStart;//开始时间
 
-    private Integer workDay;//探索期
+    private Integer workDay;//探索日期,记录毫秒,转成成工作日期。
 
     private String workFlag;//每次探索生成一个唯一标识
 
@@ -28,9 +29,13 @@ public class ComCharactersDiscoverySimpleVo implements Serializable {
 
     private Integer sceneId;//当前场景Id
 
-    private String rewardItem;
+    private String rewardItem; //记录奖励物品
 
-    private String rewardExp;
+    private String rewardCount; //记录奖励物品的数量 reward_item 奖励对应的数量 1000|2000
+
+    private Integer rewardExp; //记录奖励的经验
+
+    private String allItem; //全部产出的item记录
 
     private String note;//描述
 

src/main/java/com/td/WaDa/game/comcharactersdiscovery/vo/ComCharactersDiscoveryVo.java → src/main/java/com/td/Dawa/game/comcharactersdiscovery/vo/ComCharactersDiscoveryVo.java

@@ -1,7 +1,8 @@
-package com.td.WaDa.game.comcharactersdiscovery.vo;
+package com.td.Dawa.game.comcharactersdiscovery.vo;
 
-import com.td.WaDa. common.pojo.PageCondition;import lombok.Data;
+import com.td.Dawa. common.pojo.PageCondition;import lombok.Data;
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.util.Date;
 
 @Data
@@ -20,7 +21,7 @@ public class ComCharactersDiscoveryVo extends PageCondition implements Serializa
 
     private Date workStart;//开始时间
 
-    private Integer workDay;//探索期
+    private Integer workDay;//探索日期,记录毫秒,转成成工作日期。
 
     private String workFlag;//每次探索生成一个唯一标识
 
@@ -28,9 +29,13 @@ public class ComCharactersDiscoveryVo extends PageCondition implements Serializa
 
     private Integer sceneId;//当前场景Id
 
-    private String rewardItem;
+    private String rewardItem; //记录奖励物品
 
-    private String rewardExp;
+    private String rewardCount; //记录奖励物品的数量 reward_item 奖励对应的数量 1000|2000
+
+    private Integer rewardExp; //记录奖励的经验
+
+    private String allItem; //全部产出的item记录
 
     private String note;//描述
 

src/main/java/com/td/WaDa/game/comcntorder/controller/ComCntOrderController.java → src/main/java/com/td/Dawa/game/comcntorder/controller/ComCntOrderController.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.game.comcntorder.controller;
+package com.td.Dawa.game.comcntorder.controller;
 
-import com.td.WaDa.common.controller.*;
-import com.td.WaDa.game.comcntorder.pojo.ComCntOrder;
-import com.td.WaDa.game.comcntorder.vo.ComCntOrderVo;
-import com.td.WaDa.game.comcntorder.service.ComCntOrderService;
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.game.comcntorder.pojo.ComCntOrder;
+import com.td.Dawa.game.comcntorder.vo.ComCntOrderVo;
+import com.td.Dawa.game.comcntorder.service.ComCntOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/td/WaDa/game/comcntorder/pojo/ComCntOrder.java → src/main/java/com/td/Dawa/game/comcntorder/pojo/ComCntOrder.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comcntorder.pojo;
+package com.td.Dawa.game.comcntorder.pojo;
 
 import lombok.Data;
 import javax.persistence.*;

src/main/java/com/td/WaDa/game/comcntorder/repository/ComCntOrderRepository.java → src/main/java/com/td/Dawa/game/comcntorder/repository/ComCntOrderRepository.java

@@ -1,8 +1,8 @@
-package com.td.WaDa.game.comcntorder.repository;
+package com.td.Dawa.game.comcntorder.repository;
 
-import com.td.WaDa.common.repository.*;
-import com.td.WaDa.game.comcntorder.pojo.ComCntOrder;
-import com.td.WaDa.game.comcntorder.vo.ComCntOrderPayTypeSumVo;
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.comcntorder.pojo.ComCntOrder;
+import com.td.Dawa.game.comcntorder.vo.ComCntOrderPayTypeSumVo;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
@@ -24,7 +24,7 @@ public interface ComCntOrderRepository extends CommonRepository<ComCntOrder, Str
      *
      * @return
      */
-    @Query(value = "SELECT new com.td.WaDa.game.comcntorder.vo.ComCntOrderPayTypeSumVo(u.payType,sum(u.payAmount)) from ComCntOrder u GROUP BY u.payType ORDER BY sum(u.payAmount) desc", nativeQuery = false)
+    @Query(value = "SELECT new com.td.Dawa.game.comcntorder.vo.ComCntOrderPayTypeSumVo(u.payType,sum(u.payAmount)) from ComCntOrder u GROUP BY u.payType ORDER BY sum(u.payAmount) desc", nativeQuery = false)
     List<ComCntOrderPayTypeSumVo> findCNTSumByPayType();
 
 
@@ -34,7 +34,7 @@ public interface ComCntOrderRepository extends CommonRepository<ComCntOrder, Str
      * @param endTime
      * @return
      */
-    @Query(value = "SELECT new com.td.WaDa.game.comcntorder.vo.ComCntOrderPayTypeSumVo(u.payType,sum(u.payAmount)) FROM  ComCntOrder u  where u.createTime >= :startTime and u.createTime<= :endTime GROUP BY u.payType ORDER BY sum(u.payAmount) desc")
+    @Query(value = "SELECT new com.td.Dawa.game.comcntorder.vo.ComCntOrderPayTypeSumVo(u.payType,sum(u.payAmount)) FROM  ComCntOrder u  where u.createTime >= :startTime and u.createTime<= :endTime GROUP BY u.payType ORDER BY sum(u.payAmount) desc")
     List<ComCntOrderPayTypeSumVo> findCNTSumByPayTypeFromDate(Date startTime, Date endTime);
 
 }

src/main/java/com/td/WaDa/game/comcntorder/service/ComCntOrderService.java → src/main/java/com/td/Dawa/game/comcntorder/service/ComCntOrderService.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.game.comcntorder.service;
+package com.td.Dawa.game.comcntorder.service;
 
-import com.td.WaDa.common.service.*;
-import com.td.WaDa.game.comcntorder.pojo.ComCntOrder;
-import com.td.WaDa.game.comcntorder.vo.ComCntOrderPayTypeSumVo;
-import com.td.WaDa.game.comcntorder.vo.ComCntOrderVo;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comcntorder.pojo.ComCntOrder;
+import com.td.Dawa.game.comcntorder.vo.ComCntOrderPayTypeSumVo;
+import com.td.Dawa.game.comcntorder.vo.ComCntOrderVo;
 
 import java.util.Date;
 import java.util.List;

src/main/java/com/td/WaDa/game/comcntorder/service/ComCntOrderServiceImpl.java → src/main/java/com/td/Dawa/game/comcntorder/service/ComCntOrderServiceImpl.java

@@ -1,11 +1,11 @@
-package com.td.WaDa.game.comcntorder.service;
-
-import com.td.WaDa.common.service.*;
-import com.td.WaDa.game.comcntorder.pojo.ComCntOrder;
-import com.td.WaDa.game.comcntorder.vo.ComCntOrderPayTypeSumVo;
-import com.td.WaDa.game.comcntorder.vo.ComCntOrderVo;
-import com.td.WaDa.game.comcntorder.repository.ComCntOrderRepository;
-import com.td.WaDa.util.CopyUtil;
+package com.td.Dawa.game.comcntorder.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comcntorder.pojo.ComCntOrder;
+import com.td.Dawa.game.comcntorder.vo.ComCntOrderPayTypeSumVo;
+import com.td.Dawa.game.comcntorder.vo.ComCntOrderVo;
+import com.td.Dawa.game.comcntorder.repository.ComCntOrderRepository;
+import com.td.Dawa.util.CopyUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/td/WaDa/game/comcntorder/vo/ComCntOrderDateVo.java → src/main/java/com/td/Dawa/game/comcntorder/vo/ComCntOrderDateVo.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comcntorder.vo;
+package com.td.Dawa.game.comcntorder.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

src/main/java/com/td/WaDa/game/comcntorder/vo/ComCntOrderPayTypeSumVo.java → src/main/java/com/td/Dawa/game/comcntorder/vo/ComCntOrderPayTypeSumVo.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comcntorder.vo;
+package com.td.Dawa.game.comcntorder.vo;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/td/WaDa/game/comcntorder/vo/ComCntOrderVo.java → src/main/java/com/td/Dawa/game/comcntorder/vo/ComCntOrderVo.java

@@ -1,6 +1,6 @@
-package com.td.WaDa.game.comcntorder.vo;
+package com.td.Dawa.game.comcntorder.vo;
 
-import com.td.WaDa. common.pojo.PageCondition;import lombok.Data;
+import com.td.Dawa. common.pojo.PageCondition;import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 

src/main/java/com/td/WaDa/game/comcnttosnb/controller/ComCntToSnbController.java → src/main/java/com/td/Dawa/game/comcnttosnb/controller/ComCntToSnbController.java

@@ -1,10 +1,10 @@
-package com.td.WaDa.game.comcnttosnb.controller;
+package com.td.Dawa.game.comcnttosnb.controller;
 
-import com.td.WaDa.common.controller.CommonController;
-import com.td.WaDa.common.pojo.Result;
-import com.td.WaDa.game.comcnttosnb.pojo.ComCntToSnb;
-import com.td.WaDa.game.comcnttosnb.service.ComCntToSnbService;
-import com.td.WaDa.game.comcnttosnb.vo.ComCntToSnbVo;
+import com.td.Dawa.common.controller.CommonController;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.game.comcnttosnb.pojo.ComCntToSnb;
+import com.td.Dawa.game.comcnttosnb.service.ComCntToSnbService;
+import com.td.Dawa.game.comcnttosnb.vo.ComCntToSnbVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/td/WaDa/game/comcnttosnb/pojo/ComCntToSnb.java → src/main/java/com/td/Dawa/game/comcnttosnb/pojo/ComCntToSnb.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comcnttosnb.pojo;
+package com.td.Dawa.game.comcnttosnb.pojo;
 
 import lombok.Data;
 

src/main/java/com/td/WaDa/game/comcnttosnb/repository/ComCntToSnbRespository.java → src/main/java/com/td/Dawa/game/comcnttosnb/repository/ComCntToSnbRespository.java

@@ -1,7 +1,7 @@
-package com.td.WaDa.game.comcnttosnb.repository;
+package com.td.Dawa.game.comcnttosnb.repository;
 
-import com.td.WaDa.common.repository.CommonRepository;
-import com.td.WaDa.game.comcnttosnb.pojo.ComCntToSnb;
+import com.td.Dawa.common.repository.CommonRepository;
+import com.td.Dawa.game.comcnttosnb.pojo.ComCntToSnb;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/td/WaDa/game/comcnttosnb/service/ComCntToSnbService.java → src/main/java/com/td/Dawa/game/comcnttosnb/service/ComCntToSnbService.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.game.comcnttosnb.service;
+package com.td.Dawa.game.comcnttosnb.service;
 
-import com.td.WaDa.common.pojo.Result;
-import com.td.WaDa.common.service.CommonService;
-import com.td.WaDa.game.comcnttosnb.pojo.ComCntToSnb;
-import com.td.WaDa.game.comcnttosnb.vo.ComCntToSnbVo;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.common.service.CommonService;
+import com.td.Dawa.game.comcnttosnb.pojo.ComCntToSnb;
+import com.td.Dawa.game.comcnttosnb.vo.ComCntToSnbVo;
 
 import java.util.Date;
 import java.util.List;

src/main/java/com/td/WaDa/game/comcnttosnb/service/ComCntToSnbServiceImpl.java → src/main/java/com/td/Dawa/game/comcnttosnb/service/ComCntToSnbServiceImpl.java

@@ -1,22 +1,22 @@
-package com.td.WaDa.game.comcnttosnb.service;
+package com.td.Dawa.game.comcnttosnb.service;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
-import com.td.WaDa.common.pojo.Result;
-import com.td.WaDa.common.service.CommonServiceImpl;
-import com.td.WaDa.config.enums.ResultEnum;
-import com.td.WaDa.game.comcnttosnb.pojo.ComCntToSnb;
-import com.td.WaDa.game.comcnttosnb.repository.ComCntToSnbRespository;
-import com.td.WaDa.game.comcnttosnb.vo.ComCntToSnbVo;
-import com.td.WaDa.game.comsnbtran.service.ComSnbTranService;
-import com.td.WaDa.game.comsnbtran.vo.ComSnbTranVo;
-import com.td.WaDa.game.comusers.service.ComUsersService;
-import com.td.WaDa.game.comusers.vo.ComUsersVo;
-import com.td.WaDa.util.CopyUtil;
-import com.td.WaDa.util.RedisData;
-import com.td.WaDa.util.RedisLock;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.common.service.CommonServiceImpl;
+import com.td.Dawa.config.enums.ResultEnum;
+import com.td.Dawa.game.comcnttosnb.pojo.ComCntToSnb;
+import com.td.Dawa.game.comcnttosnb.repository.ComCntToSnbRespository;
+import com.td.Dawa.game.comcnttosnb.vo.ComCntToSnbVo;
+import com.td.Dawa.game.comsnbtran.service.ComSnbTranService;
+import com.td.Dawa.game.comsnbtran.vo.ComSnbTranVo;
+import com.td.Dawa.game.comusers.service.ComUsersService;
+import com.td.Dawa.game.comusers.vo.ComUsersVo;
+import com.td.Dawa.util.CopyUtil;
+import com.td.Dawa.util.RedisData;
+import com.td.Dawa.util.RedisLock;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;

src/main/java/com/td/WaDa/game/comcnttosnb/vo/ComCntToSnbVo.java → src/main/java/com/td/Dawa/game/comcnttosnb/vo/ComCntToSnbVo.java

@@ -1,6 +1,6 @@
-package com.td.WaDa.game.comcnttosnb.vo;
+package com.td.Dawa.game.comcnttosnb.vo;
 
-import com.td.WaDa.common.pojo.PageCondition;
+import com.td.Dawa.common.pojo.PageCondition;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/com/td/WaDa/game/comconfigland/controller/ComConfigLandController.java → src/main/java/com/td/Dawa/game/comconfigland/controller/ComConfigLandController.java

@@ -1,10 +1,10 @@
-package com.td.WaDa.game.comconfigland.controller;
+package com.td.Dawa.game.comconfigland.controller;
 
-import com.td.WaDa.common.controller.*;
-import com.td.WaDa.common.pojo.Result;
-import com.td.WaDa.game.comconfigland.pojo.ComConfigLand;
-import com.td.WaDa.game.comconfigland.vo.ComConfigLandVo;
-import com.td.WaDa.game.comconfigland.service.ComConfigLandService;
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.game.comconfigland.pojo.ComConfigLand;
+import com.td.Dawa.game.comconfigland.vo.ComConfigLandVo;
+import com.td.Dawa.game.comconfigland.service.ComConfigLandService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/td/WaDa/game/comconfigland/pojo/ComConfigLand.java → src/main/java/com/td/Dawa/game/comconfigland/pojo/ComConfigLand.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comconfigland.pojo;
+package com.td.Dawa.game.comconfigland.pojo;
 
 import lombok.Data;
 import javax.persistence.*;

src/main/java/com/td/WaDa/game/comconfigland/repository/ComConfigLandRepository.java → src/main/java/com/td/Dawa/game/comconfigland/repository/ComConfigLandRepository.java

@@ -1,7 +1,7 @@
-package com.td.WaDa.game.comconfigland.repository;
+package com.td.Dawa.game.comconfigland.repository;
 
-import com.td.WaDa.common.repository.*;
-import com.td.WaDa.game.comconfigland.pojo.ComConfigLand;
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.comconfigland.pojo.ComConfigLand;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/td/WaDa/game/comconfigland/service/ComConfigLandService.java → src/main/java/com/td/Dawa/game/comconfigland/service/ComConfigLandService.java

@@ -1,8 +1,8 @@
-package com.td.WaDa.game.comconfigland.service;
+package com.td.Dawa.game.comconfigland.service;
 
-import com.td.WaDa.common.service.*;
-import com.td.WaDa.game.comconfigland.pojo.ComConfigLand;
-import com.td.WaDa.game.comconfigland.vo.ComConfigLandVo;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comconfigland.pojo.ComConfigLand;
+import com.td.Dawa.game.comconfigland.vo.ComConfigLandVo;
 
 import java.util.List;
 

src/main/java/com/td/WaDa/game/comconfigland/service/ComConfigLandServiceImpl.java → src/main/java/com/td/Dawa/game/comconfigland/service/ComConfigLandServiceImpl.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.game.comconfigland.service;
+package com.td.Dawa.game.comconfigland.service;
 
-import com.td.WaDa.common.service.*;
-import com.td.WaDa.game.comconfigland.pojo.ComConfigLand;
-import com.td.WaDa.game.comconfigland.vo.ComConfigLandVo;
-import com.td.WaDa.game.comconfigland.repository.ComConfigLandRepository;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comconfigland.pojo.ComConfigLand;
+import com.td.Dawa.game.comconfigland.vo.ComConfigLandVo;
+import com.td.Dawa.game.comconfigland.repository.ComConfigLandRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/td/WaDa/game/comconfigland/vo/ComConfigLandVo.java → src/main/java/com/td/Dawa/game/comconfigland/vo/ComConfigLandVo.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comconfigland.vo;
+package com.td.Dawa.game.comconfigland.vo;
 
 import lombok.Data;
 import java.io.Serializable;

src/main/java/com/td/WaDa/game/comexplainland/controller/ComExplainLandController.java → src/main/java/com/td/Dawa/game/comexplainland/controller/ComExplainLandController.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.game.comexplainland.controller;
+package com.td.Dawa.game.comexplainland.controller;
 
-import com.td.WaDa.common.controller.*;
-import com.td.WaDa.game.comexplainland.pojo.ComExplainLand;
-import com.td.WaDa.game.comexplainland.vo.ComExplainLandVo;
-import com.td.WaDa.game.comexplainland.service.ComExplainLandService;
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.game.comexplainland.pojo.ComExplainLand;
+import com.td.Dawa.game.comexplainland.vo.ComExplainLandVo;
+import com.td.Dawa.game.comexplainland.service.ComExplainLandService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/td/WaDa/game/comexplainland/pojo/ComExplainLand.java → src/main/java/com/td/Dawa/game/comexplainland/pojo/ComExplainLand.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comexplainland.pojo;
+package com.td.Dawa.game.comexplainland.pojo;
 
 import lombok.Data;
 import javax.persistence.*;

src/main/java/com/td/WaDa/game/comexplainland/repository/ComExplainLandRepository.java → src/main/java/com/td/Dawa/game/comexplainland/repository/ComExplainLandRepository.java

@@ -1,7 +1,7 @@
-package com.td.WaDa.game.comexplainland.repository;
+package com.td.Dawa.game.comexplainland.repository;
 
-import com.td.WaDa.common.repository.*;
-import com.td.WaDa.game.comexplainland.pojo.ComExplainLand;
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.comexplainland.pojo.ComExplainLand;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/td/Dawa/game/comexplainland/service/ComExplainLandService.java

@@ -0,0 +1,8 @@
+package com.td.Dawa.game.comexplainland.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comexplainland.pojo.ComExplainLand;
+import com.td.Dawa.game.comexplainland.vo.ComExplainLandVo;
+
+public interface ComExplainLandService extends CommonService<ComExplainLandVo, ComExplainLand, String> {
+}

src/main/java/com/td/WaDa/game/comexplainland/service/ComExplainLandServiceImpl.java → src/main/java/com/td/Dawa/game/comexplainland/service/ComExplainLandServiceImpl.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.game.comexplainland.service;
+package com.td.Dawa.game.comexplainland.service;
 
-import com.td.WaDa.common.service.*;
-import com.td.WaDa.game.comexplainland.pojo.ComExplainLand;
-import com.td.WaDa.game.comexplainland.vo.ComExplainLandVo;
-import com.td.WaDa.game.comexplainland.repository.ComExplainLandRepository;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comexplainland.pojo.ComExplainLand;
+import com.td.Dawa.game.comexplainland.vo.ComExplainLandVo;
+import com.td.Dawa.game.comexplainland.repository.ComExplainLandRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/td/WaDa/game/comexplainland/vo/ComExplainLandVo.java → src/main/java/com/td/Dawa/game/comexplainland/vo/ComExplainLandVo.java

@@ -1,6 +1,6 @@
-package com.td.WaDa.game.comexplainland.vo;
+package com.td.Dawa.game.comexplainland.vo;
 
-import com.td.WaDa. common.pojo.PageCondition;import lombok.Data;
+import com.td.Dawa. common.pojo.PageCondition;import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 

src/main/java/com/td/WaDa/game/comfruit/controller/ComFruitController.java → src/main/java/com/td/Dawa/game/comfruit/controller/ComFruitController.java

@@ -1,9 +1,9 @@
-package com.td.WaDa.game.comfruit.controller;
+package com.td.Dawa.game.comfruit.controller;
 
-import com.td.WaDa.common.controller.*;
-import com.td.WaDa.game.comfruit.pojo.ComFruit;
-import com.td.WaDa.game.comfruit.vo.ComFruitVo;
-import com.td.WaDa.game.comfruit.service.ComFruitService;
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.game.comfruit.pojo.ComFruit;
+import com.td.Dawa.game.comfruit.vo.ComFruitVo;
+import com.td.Dawa.game.comfruit.service.ComFruitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/td/WaDa/game/comfruit/pojo/ComFruit.java → src/main/java/com/td/Dawa/game/comfruit/pojo/ComFruit.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comfruit.pojo;
+package com.td.Dawa.game.comfruit.pojo;
 
 import lombok.Data;
 import javax.persistence.*;

src/main/java/com/td/WaDa/game/comfruit/repository/ComFruitRepository.java → src/main/java/com/td/Dawa/game/comfruit/repository/ComFruitRepository.java

@@ -1,7 +1,7 @@
-package com.td.WaDa.game.comfruit.repository;
+package com.td.Dawa.game.comfruit.repository;
 
-import com.td.WaDa.common.repository.*;
-import com.td.WaDa.game.comfruit.pojo.ComFruit;
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.comfruit.pojo.ComFruit;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/td/WaDa/game/comfruit/service/ComFruitService.java → src/main/java/com/td/Dawa/game/comfruit/service/ComFruitService.java

@@ -1,8 +1,8 @@
-package com.td.WaDa.game.comfruit.service;
+package com.td.Dawa.game.comfruit.service;
 
-import com.td.WaDa.common.service.*;
-import com.td.WaDa.game.comfruit.pojo.ComFruit;
-import com.td.WaDa.game.comfruit.vo.ComFruitVo;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comfruit.pojo.ComFruit;
+import com.td.Dawa.game.comfruit.vo.ComFruitVo;
 
 import java.util.List;
 

src/main/java/com/td/WaDa/game/comfruit/service/ComFruitServiceImpl.java → src/main/java/com/td/Dawa/game/comfruit/service/ComFruitServiceImpl.java

@@ -1,10 +1,10 @@
-package com.td.WaDa.game.comfruit.service;
+package com.td.Dawa.game.comfruit.service;
 
-import com.td.WaDa.common.service.*;
-import com.td.WaDa.game.comfruit.pojo.ComFruit;
-import com.td.WaDa.game.comfruit.vo.ComFruitVo;
-import com.td.WaDa.game.comfruit.repository.ComFruitRepository;
-import com.td.WaDa.util.CopyUtil;
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.comfruit.pojo.ComFruit;
+import com.td.Dawa.game.comfruit.vo.ComFruitVo;
+import com.td.Dawa.game.comfruit.repository.ComFruitRepository;
+import com.td.Dawa.util.CopyUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/td/WaDa/game/comfruit/vo/ComFruitAmountVo.java → src/main/java/com/td/Dawa/game/comfruit/vo/ComFruitAmountVo.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comfruit.vo;
+package com.td.Dawa.game.comfruit.vo;
 
 import lombok.Data;
 

src/main/java/com/td/WaDa/game/comfruit/vo/ComFruitVo.java → src/main/java/com/td/Dawa/game/comfruit/vo/ComFruitVo.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.comfruit.vo;
+package com.td.Dawa.game.comfruit.vo;
 
 import lombok.Data;
 import java.io.Serializable;

src/main/java/com/td/WaDa/game/commallfood/controller/ComMallFoodController.java → src/main/java/com/td/Dawa/game/commallfood/controller/ComMallFoodController.java

@@ -1,12 +1,12 @@
-package com.td.WaDa.game.commallfood.controller;
-
-import com.td.WaDa.common.controller.*;
-import com.td.WaDa.common.pojo.Result;
-import com.td.WaDa.game.commallfood.pojo.ComMallFood;
-import com.td.WaDa.game.commallfood.vo.ComMallFoodSimpleVo;
-import com.td.WaDa.game.commallfood.vo.ComMallFoodVo;
-import com.td.WaDa.game.commallfood.service.ComMallFoodService;
-import com.td.WaDa.util.CopyUtil;
+package com.td.Dawa.game.commallfood.controller;
+
+import com.td.Dawa.common.controller.*;
+import com.td.Dawa.common.pojo.Result;
+import com.td.Dawa.game.commallfood.pojo.ComMallFood;
+import com.td.Dawa.game.commallfood.vo.ComMallFoodSimpleVo;
+import com.td.Dawa.game.commallfood.vo.ComMallFoodVo;
+import com.td.Dawa.game.commallfood.service.ComMallFoodService;
+import com.td.Dawa.util.CopyUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/td/WaDa/game/commallfood/pojo/ComMallFood.java → src/main/java/com/td/Dawa/game/commallfood/pojo/ComMallFood.java

@@ -1,4 +1,4 @@
-package com.td.WaDa.game.commallfood.pojo;
+package com.td.Dawa.game.commallfood.pojo;
 
 import lombok.Data;
 import javax.persistence.*;

src/main/java/com/td/WaDa/game/commallfood/repository/ComMallFoodRepository.java → src/main/java/com/td/Dawa/game/commallfood/repository/ComMallFoodRepository.java

@@ -1,7 +1,7 @@
-package com.td.WaDa.game.commallfood.repository;
+package com.td.Dawa.game.commallfood.repository;
 
-import com.td.WaDa.common.repository.*;
-import com.td.WaDa.game.commallfood.pojo.ComMallFood;
+import com.td.Dawa.common.repository.*;
+import com.td.Dawa.game.commallfood.pojo.ComMallFood;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/td/Dawa/game/commallfood/service/ComMallFoodService.java

@@ -0,0 +1,8 @@
+package com.td.Dawa.game.commallfood.service;
+
+import com.td.Dawa.common.service.*;
+import com.td.Dawa.game.commallfood.pojo.ComMallFood;
+import com.td.Dawa.game.commallfood.vo.ComMallFoodVo;
+
+public interface ComMallFoodService extends CommonService<ComMallFoodVo, ComMallFood, Integer> {
+}