1.修改标签类型

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

@@ -32,10 +32,11 @@ public enum GameEnum {
     PRO_INTELLIGENCE(1,"影响勘探"),
     PRO_SKIlLS(2,"影响运输"),
 
-    PRO_WORK_MINING(1,"工作职业为挖矿"),
+    PRO_WORK_NORMAL(0,"自由工作职业"),
+    PRO_WORK_MINING(1,"工作职业为挖矿职业"),
     PRO_WORK_PROSPECT(2,"工作职业为勘探职业"),
     PRO_WORK_TRANSPORT(3,"工作职业为运输职业"),
-    PRO_WORK_LUMBERING(4,"工作职业为运输职业"),
+    PRO_WORK_LUMBERING(4,"工作职业为伐木职业"),
 
     //伐木场景id
     LUMBERING_00(101,"深林入口"),

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

@@ -54,6 +54,7 @@ public enum ResultEnum {
     PLAYER_ATTRIBUTE_SAVE_LOCK(520,"属性操作繁满，稍后再试！"),
 
     ROLE_DOES_NOT_EXIST(521,"不存在角色信息！"),
+    ROLE_PRO_DOES_NOT_EXIST(521,"不存在角色职业信息！"),
     ROLE_ADD_ERROR(522,"添加角色信息异常！"),
     ROLE_NAME_TOO_LONG(522,"角色名字不能大于12个字！"),
     ROLE_ALREADY_ADD(522,"角色已经添加！"),
@@ -68,6 +69,9 @@ public enum ResultEnum {
     EXPLORATION_ING(527,"勘探队伍正在工作！"),
     EXPLORATION_COMPLETE(527,"勘探队伍已完成工作！"),
     EXPLORATION_NOT_STOP(528,"工作时间未结束！"),
+
+
+    SCENE_ID_NOT(530,"没有对应场景！"),
     //钱包数据
     WALLET_CNT_PLAY_ERROR(601,"钱包CNT支付参数数据错误！"),
     WALLET_SNB_INSUFFICIENT_QUANTITY(602,"snb不足以支付！"),

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

@@ -65,7 +65,7 @@ public class ComCharactersController extends CommonController<ComCharactersVo, C
 
     /**
      * 玩家选择一个添加角色,
-     * 根据角色id，生成属性，添加成功后， todo 扣除对应的消费金额
+     * 因为召唤已经扣除了金币，添加角色直接检测是否召唤消耗过金币
      *
      * @param userId
      * @return
@@ -138,7 +138,7 @@ public class ComCharactersController extends CommonController<ComCharactersVo, C
 
     /**
      * 列表排列顺序，根据选中职业对应属性高低排序
-     * 挖矿：力量高的排前边
+     * 挖矿(伐木)：力量高的排前边
      * 勘探：智力高的排前边
      * 运输：技巧高的排前边
      *
@@ -148,8 +148,8 @@ public class ComCharactersController extends CommonController<ComCharactersVo, C
     @PostMapping("getRoleList")
     @Encrypt
     public Result<List<ComCharactersClientVo>> getRoleList(@RequestParam(value = "userId") String userId,
-    @RequestParam(value = "professional") Integer professional) {
-        List<ComCharactersClientVo> charactersClientVos = comCharactersService.findByProfessionalSort(userId,professional);
+    @RequestParam(value = "attribute") Integer attribute) {
+        List<ComCharactersClientVo> charactersClientVos = comCharactersService.findByProfessionalSort(userId,attribute);
         return Result.of(charactersClientVos);
     }
 

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

@@ -15,6 +15,8 @@ public interface ComCharactersRepository extends CommonRepository<ComCharacters,
 
     List<ComCharacters> findByUserIdAndProfessional(String userId,Integer professional, Sort sort);
 
+    List<ComCharacters> findAllByUserId(String userId, Sort sort);
+
     List<ComCharacters> findByIdIn(Integer[] ids, Sort sort);
 
 }

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

@@ -139,10 +139,10 @@ public class ComCharactersServiceImpl extends CommonServiceImpl<ComCharactersVo,
         comCharacters.setSkills(_skillsDouble.intValue());
 
 
-        String[] itemArray = _attr.getProfessional().split("\\|");
-
-        int a = (int) Math.floor(new Random().nextDouble() * itemArray.length);
-        comCharacters.setProfessional(Integer.parseInt(itemArray[a]));
+        //tring[] itemArray = _attr.getProfessional().split("\\|");
+        //int a = (int) Math.floor(new Random().nextDouble() * itemArray.length);
+        //Integer.parseInt(itemArray[a])
+        comCharacters.setProfessional(0);//这里不区分职业，直接记录一个默认值，进行队伍配置时候，设置一个 1,2,3,4(挖矿，勘探，运输，伐木)
 
         comCharacters.setAction(_attr.getAction());
 
@@ -171,7 +171,6 @@ public class ComCharactersServiceImpl extends CommonServiceImpl<ComCharactersVo,
         //设置经验和等级
         comCharacters.setExp(0);
         comCharacters.setLevel(1);
-        //todo 需要扣除对应金币
 
         comCharacters.setCreateTime(DateUtil.date());
         comCharacters.setUpdateTime(DateUtil.date());
@@ -208,7 +207,12 @@ public class ComCharactersServiceImpl extends CommonServiceImpl<ComCharactersVo,
         return comCharactersRepository.findByRoleId(roleId).orElse(null);
     }
 
-
+    /**
+     * 根据 工作类型返回对应的属性排名
+     * @param userId
+     * @param professional
+     * @return
+     */
     @Override
     public List<ComCharactersClientVo> findByProfessionalSort(String userId, Integer professional) {
         String _properties = "power";//默认power排序
@@ -219,7 +223,7 @@ public class ComCharactersServiceImpl extends CommonServiceImpl<ComCharactersVo,
         } else if (professional.equals(GameEnum.PRO_SKIlLS.getValue())) {
             _properties = "skills";
         }
-        List<ComCharacters> comCharactersList = comCharactersRepository.findByUserIdAndProfessional(userId, professional, Sort.by(Sort.Direction.DESC, _properties));
+        List<ComCharacters> comCharactersList = comCharactersRepository.findAllByUserId(userId, Sort.by(Sort.Direction.DESC, _properties));
         List<ComCharactersClientVo> comCharactersClientVos = comCharactersList.stream().map(e -> {
             ComCharactersClientVo comCharactersClientVo = new ComCharactersClientVo();
             comCharactersClientVo = CopyUtil.copy(e, ComCharactersClientVo.class);

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

@@ -7,6 +7,7 @@ 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.GameEnum;
 import com.td.Dawa.config.enums.ResultEnum;
 import com.td.Dawa.config.exception.AuthorizeException;
 import com.td.Dawa.game.comcharacters.service.ComCharactersService;
@@ -40,7 +41,7 @@ public class ComCharactersDiscoveryController extends CommonController<ComCharac
     @Decrypt
     @Encrypt
     public Result<?> startExploration(@RequestParam(value = "userId") String userId,
-                                                                   @RequestParam(value = "sceneId") Integer sceneId) {
+                                      @RequestParam(value = "sceneId") Integer sceneId) {
         try {
             ComCharactersDiscoveryClientVo characterDiscoveryClientVo = comCharactersDiscoveryService.startDiscover(userId, sceneId);
             return Result.of(characterDiscoveryClientVo);
@@ -65,15 +66,31 @@ public class ComCharactersDiscoveryController extends CommonController<ComCharac
     @Encrypt
     public Result<?> addExplorationRole(@RequestParam(value = "userId") String userId,
                                         @RequestParam(value = "roleId") Integer roleId,
+                                        @RequestParam(value = "workPos") Integer workPos,
                                         @RequestParam(value = "sceneId") Integer sceneId) {
         try {
-            //todo  暂时roleType对应这roleId
-            //      暂时可以创建多个相同的角色
             //拿出一个角色对应的配置数据来生成角色
             ComCharactersVo comCharactersVo = comCharactersService.getVo(roleId);
             if (comCharactersVo == null || !comCharactersVo.getUserId().equals(userId)) {
                 return Result.of(null, false, ResultEnum.ROLE_DOES_NOT_EXIST);
             }
+            if (workPos.equals(GameEnum.PRO_POWER.getValue())) {
+                //按场景区分，是挖矿还是伐木
+                if (sceneId.equals(GameEnum.MINE_00.getValue())) {
+                    comCharactersVo.setProfessional(GameEnum.PRO_WORK_MINING.getValue());
+                } else if (sceneId.equals(GameEnum.LUMBERING_00.getValue())) {
+                    comCharactersVo.setProfessional(GameEnum.PRO_WORK_LUMBERING.getValue());
+                } else {
+                    //不存在场景时候，抛出异常
+                    return Result.of(null, false, ResultEnum.SCENE_ID_NOT);
+                }
+            } else if (workPos.equals(GameEnum.PRO_INTELLIGENCE.getValue())) {
+                comCharactersVo.setProfessional(GameEnum.PRO_WORK_PROSPECT.getValue());
+            } else if (workPos.equals(GameEnum.PRO_SKIlLS.getValue())) {
+                comCharactersVo.setProfessional(GameEnum.PRO_WORK_TRANSPORT.getValue());
+            } else {
+                return Result.of(null, false, ResultEnum.ROLE_PRO_DOES_NOT_EXIST);
+            }
             //根据roleId 对应的数据，生成玩家数据,属性
             ComCharactersDiscoveryClientVo clientVo = comCharactersDiscoveryService.addDiscoverRole(comCharactersVo, sceneId);
             return Result.of(clientVo);

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

@@ -145,7 +145,7 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
         List<ComCharactersClientVo> comCharactersClientVos = characters.stream().map(e -> {
             ComCharactersClientVo comCharactersClientVo = new ComCharactersClientVo();
             comCharactersClientVo = CopyUtil.copy(e, ComCharactersClientVo.class);
-            comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, e.getModelId(),e.getModelColor());
+            comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, e.getModelId(), e.getModelColor());
             //Integer[] _modelIdArray = Convert.toIntArray(e.getModelId().split("\\|"));
             ////查询position
             //List<ExcelCharacterCreate> _genList = excelCharacterCreateService.findByModelIn(_modelIdArray);
@@ -168,7 +168,7 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
     }
 
     /**
-     * 添加角色
+     * 添加角色,根据当前位置，设置工作类型，就是当前professional（1,2,3,4）
      *
      * @param charactersVo
      * @param sceneId
@@ -240,6 +240,9 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
             }
             comCharacterDiscovery.setUpdateTime(DateUtil.date());
         }
+        //保存一次用户修改的当前职业工作标签,工作结算时候，重置一次为零
+        comCharactersService.save(charactersVo);
+
         ComCharactersDiscoveryVo comCharacterDiscoveryVo = CopyUtil.copy(comCharacterDiscovery, ComCharactersDiscoveryVo.class);
         super.save(comCharacterDiscoveryVo);
         ComCharactersDiscoveryClientVo comCharacterDiscoveryClientVo = CopyUtil.copy(comCharacterDiscoveryVo, ComCharactersDiscoveryClientVo.class);
@@ -427,7 +430,8 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
             ComCharactersVo comCharactersVo = CopyUtil.copy(characters.get(i), ComCharactersVo.class); //comCharactersService.getVo(Integer.parseInt(roleId[i]));
             //根据当前角色的职业计算
             Integer _professional = comCharactersVo.getProfessional();
-            if (_professional.equals(GameEnum.PRO_SKIlLS.getValue())) {
+            if (_professional.equals(GameEnum.PRO_WORK_TRANSPORT.getValue())) {
+                //_professional.equals(GameEnum.PRO_SKIlLS.getValue()
                 //运输工
                 skillChar = comCharactersVo;
                 //计算当前运输格数，即获取到物品的上限
@@ -436,10 +440,13 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
                 if (_selfLimit > outTransUpperLimit) {
                     outTransUpperLimit = _selfLimit;
                 }
-            } else if (_professional.equals(GameEnum.PRO_POWER.getValue())) {
+            } else if (_professional.equals(GameEnum.PRO_WORK_MINING.getValue()) ||
+                    _professional.equals(GameEnum.PRO_WORK_LUMBERING.getValue())) {
+                //_professional.equals(GameEnum.PRO_POWER.getValue())
                 //矿工
                 powerChar = comCharactersVo;
-            } else if (_professional.equals(GameEnum.PRO_INTELLIGENCE.getValue())) {
+            } else if (_professional.equals(GameEnum.PRO_WORK_PROSPECT.getValue())) {
+                //_professional.equals(GameEnum.PRO_INTELLIGENCE.getValue())
                 //勘测地形
                 intelliChar = comCharactersVo;
             }
@@ -518,8 +525,8 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
                             log.info("增加货币");
                             //todo 货币数据未给出，暂定100
                             ExcelParameterVo _currency = excelParameterService.getVo(8);
-                            int _num =(int) Math.round(_currency.getValue());
-                            discoveryVo.setRewardCurrency(discoveryVo.getRewardCurrency() == null ?  _num: discoveryVo.getRewardCurrency() + _num);
+                            int _num = (int) Math.round(_currency.getValue());
+                            discoveryVo.setRewardCurrency(discoveryVo.getRewardCurrency() == null ? _num : discoveryVo.getRewardCurrency() + _num);
                         }
 
                     }
@@ -529,7 +536,7 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
             //完结后三个分别增加经验
             //收获经验 todo 处理人物升级等
             ComCharactersClientVo comCharactersClientVo = upgradeComCharactersVo(powerChar, excelCharacterLevelVo, outExp);
-            comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, powerChar.getModelId(),powerChar.getModelColor());
+            comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, powerChar.getModelId(), powerChar.getModelColor());
             comCharactersClientVos.add(comCharactersClientVo);
         }
         if (intelliChar != null) {
@@ -566,14 +573,14 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
             //完结后三个分别增加经验
             //收获经验 todo 处理人物升级等
             ComCharactersClientVo comCharactersClientVo = upgradeComCharactersVo(intelliChar, excelCharacterLevelVo, outExp);
-            comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, intelliChar.getModelId(),intelliChar.getModelColor());
+            comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, intelliChar.getModelId(), intelliChar.getModelColor());
             comCharactersClientVos.add(comCharactersClientVo);
         }
         if (skillChar != null) {
             //完结后三个分别增加经验
             //收获经验 todo 处理人物升级等
             ComCharactersClientVo comCharactersClientVo = upgradeComCharactersVo(skillChar, excelCharacterLevelVo, outExp);
-            comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, skillChar.getModelId(),skillChar.getModelColor());
+            comCharactersClientVo = comCharactersService.addSubResourcesClientListToVO(comCharactersClientVo, skillChar.getModelId(), skillChar.getModelColor());
             comCharactersClientVos.add(comCharactersClientVo);
         }
         ComCharactersDiscoveryClientVo discoveryClientVo = CopyUtil.copy(discoveryVo, ComCharactersDiscoveryClientVo.class);
@@ -595,6 +602,19 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
         discoveryVo.setUpdateTime(DateUtil.date());
         //todo 工作完成后，isStop
         if (discoveryVo.getIsWork().equals(GameEnum.WORK_COMPLETE.getValue()) && isStop) {
+            //重置人物角色职业工作状态
+            if(powerChar!=null){
+                powerChar.setProfessional(GameEnum.PRO_WORK_NORMAL.getValue());
+                comCharactersService.save(powerChar);
+            }
+            if(intelliChar!=null){
+                intelliChar.setProfessional(GameEnum.PRO_WORK_NORMAL.getValue());
+                comCharactersService.save(intelliChar);
+            }
+            if(skillChar!=null){
+                skillChar.setProfessional(GameEnum.PRO_WORK_NORMAL.getValue());
+                comCharactersService.save(skillChar);
+            }
             super.delete(discoveryVo.getId());
         } else {
             //todo 后续优化，不用每次都存储
@@ -682,7 +702,8 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
         for (int i = 0; i < clientVo.getSubCharacters().size(); i++) {
             ComCharactersClientVo charactersClientVo = voList.get(i);
             Integer _professional = charactersClientVo.getProfessional();
-            if (_professional.equals(GameEnum.PRO_SKIlLS.getValue())) {
+            if (_professional.equals(GameEnum.PRO_WORK_TRANSPORT.getValue())) {
+                //_professional.equals(GameEnum.PRO_SKIlLS.getValue())
                 //运输工
                 //计算当前运输格数，即获取到物品的上限
                 //场景的最低运输数量
@@ -690,12 +711,15 @@ public class ComCharactersDiscoveryServiceImpl extends CommonServiceImpl<ComChar
                 if (_selfLimit > outTransUpperLimit) {
                     clientVo.setTransQuantity(_selfLimit);
                 }
-            } else if (_professional.equals(GameEnum.PRO_POWER.getValue())) {
+            } else if (_professional.equals(GameEnum.PRO_WORK_MINING.getValue()) ||
+                    _professional.equals(GameEnum.PRO_WORK_LUMBERING.getValue())) {
+                //_professional.equals(GameEnum.PRO_POWER.getValue())
                 //矿工
                 ExcelWorkPro excelWorkPro = getRatioByPowerAndSceneIdAndList(charactersClientVo.getPower(), clientVo.getSceneId(), workProList);
                 //todo 这个概率可能还要计算
                 clientVo.setPowerPro(excelWorkPro.getProbability());
-            } else if (_professional.equals(GameEnum.PRO_INTELLIGENCE.getValue())) {
+            } else if (_professional.equals(GameEnum.PRO_WORK_PROSPECT.getValue())) {
+                //_professional.equals(GameEnum.PRO_INTELLIGENCE.getValue())
                 //勘测地形
                 clientVo.setIntelliPro(gotoNextSceneRatioAndList(clientVo.getDiscoverLevel(), charactersClientVo.getIntelligence(), workProList));
             }

src/main/java/com/td/Dawa/game/complayersattri/vo/ComPlayersAttriClientVo.java

@@ -16,10 +16,10 @@ public class ComPlayersAttriClientVo implements Serializable {
 
     //private Integer lucky;//幸运值
 
-    private Date resetStrength;//重置体力的时间
+//    private Date resetStrength;//重置体力的时间
 
-    private Date createTime;//
+//    private Date createTime;//
 
-    private Date updateTime;//
+//    private Date updateTime;//
 
 }

src/main/java/com/td/Dawa/game/comusers/controller/ComUsersController.java

@@ -11,6 +11,7 @@ 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.comsetting.service.ComSettingService;
+import com.td.Dawa.game.comusers.vo.ComUsersClientVo;
 import com.td.Dawa.game.comusers.vo.ComUsersLoginVo;
 import com.td.Dawa.game.comusers.vo.ComUsersSimpleVo;
 import com.td.Dawa.config.enums.ResultEnum;
@@ -199,7 +200,7 @@ public class ComUsersController extends CommonController<ComUsersVo, ComUsers, S
             //生成token
             final String token = jwtTokenUtil.generateToken(comUsersVo.getUserId());
             map.put("token", token);
-            map.put("userInfo", CopyUtil.copy(comUsersVo, ComUsersSimpleVo.class));
+            map.put("userInfo", CopyUtil.copy(comUsersVo, ComUsersClientVo.class));
 
             return Result.of(map);
         } catch (HttpClientErrorException e) {

src/main/java/com/td/Dawa/game/comusers/vo/ComUsersClientVo.java

@@ -0,0 +1,27 @@
+package com.td.Dawa.game.comusers.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ComUsersClientVo implements Serializable {
+
+    private Integer gold;//游戏本身金币
+
+    private String name;//登录名字
+
+    private String realName;//真实名字
+
+    private String email;//邮件地址
+
+    private String telephone;//电话号码
+
+    private String birthday;//生日
+
+    private Integer sex;//性别
+
+    private String address;//记录一个用户钱包地址
+
+    private Integer limitTran;//是否限制交易 0：否，1：是
+}