zhixinlian
/
client-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改注释

Browse Source
pull/3/head
unclekh 4 years ago
parent b4818db605
commit 7c0c2cacb8
28 changed files with 97 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blockchain-common/blockchain-common-base/src/main/java/com/blockchain/common/base/constant/YyyfConstant.java
  2. 2
      blockchain-common/blockchain-common-base/src/main/java/com/blockchain/common/base/dto/YyyfUserDto.java
  3. 4
      blockchain-common/blockchain-common-base/src/main/java/com/blockchain/common/base/util/YyyfUserDtoUtils.java
  4. 1
      blockchain-server/blockchain-server-eth/src/main/java/com/blockchain/server/eth/common/enums/EthWalletEnums.java
  5. 8
      blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/AssessUserService.java
  6. 2
      blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/impl/AssessUserServiceImpl.java
  7. 10
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/TeachingGradeController.java
  8. 31
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/YyyfMoneyController.java
  9. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/api/TeachingGradeApi.java
  10. 24
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/api/YyyfMoneyApi.java
  11. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/AssessUserDto.java
  12. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/ExamDetailsDto.java
  13. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/OverviewDto.java
  14. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/ReExamOverviewDto.java
  15. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/TransactResultDto.java
  16. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/UserTimeMoneyDto.java
  17. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/YyyfStudentAnswerDto.java
  18. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/entity/YyyfMoney.java
  19. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/indicators/IndicatorsUtils.java
  20. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/indicators/dto/LastAndFirstAssetsDto.java
  21. 6
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/mapper/AssessUserMapper.java
  22. 4
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/mapper/AssessUserTargetMapper.java
  23. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/mapper/YyyfMoneyMapper.java
  24. 16
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/service/AssessUserService.java
  25. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/service/AssessUserTargetService.java
  26. 4
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/service/impl/AssessUserServiceImpl.java
  27. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/utils/HttpClientUtil.java
  28. 2
      blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/utils/IdGenerator.java

2
blockchain-common/blockchain-common-base/src/main/java/com/blockchain/common/base/constant/YyyfConstant.java
Unescape View File

@ -1,7 +1,7 @@
package com.blockchain.common.base.constant;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className CaseConstant
* @description

2
blockchain-common/blockchain-common-base/src/main/java/com/blockchain/common/base/dto/YyyfUserDto.java
Unescape View File

@ -7,7 +7,7 @@ import java.math.BigDecimal;
import java.util.Map;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className YyyfUserDto
* @description

4
blockchain-common/blockchain-common-base/src/main/java/com/blockchain/common/base/util/YyyfUserDtoUtils.java
Unescape View File

@ -8,7 +8,7 @@ import org.springframework.data.redis.core.RedisTemplate;
import javax.servlet.http.HttpServletRequest;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className YyyfUserDto
* @description
@ -36,7 +36,7 @@ public class YyyfUserDtoUtils {
/**
* @description 通过userId获取以渔有方用户信息
* @author huan.xu
* @author haotian
* @date 2020-05-20 15:42:47
* @param [userId, redisTemplate]
* @return com.blockchain.common.base.dto.YyyfUserDto

1
blockchain-server/blockchain-server-eth/src/main/java/com/blockchain/server/eth/common/enums/EthWalletEnums.java
Unescape View File

@ -1,6 +1,7 @@
package com.blockchain.server.eth.common.enums;
public enum EthWalletEnums {
FREEBALANCE_NOT_ENOUGH(7009, "钱包可用余额不足", "Insufficient balance available in wallet.", "錢包可用餘額不足"),
SUCCESS(200, "请求成功", "Request success", ""),
RESET_ERROR(7001, "查无初始额度设置，充值失败", "Check no initial limit Settings, recharge failed", "查無初始額度設置，充值失敗"),
NO_LOGIN(201, "未登录", "No login", ""),

8
blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/AssessUserService.java
Unescape View File

@ -9,7 +9,7 @@ import java.util.List;
/**
* @param
* @author huan.xu
* @author haotian
* @description 学生用户考核信息表 服务接口类
* @date 2019-10-31 14:36:49
* @return
@ -33,7 +33,7 @@ public interface AssessUserService {
/**
* @description 插入
* @author Mr.Xu
* @author
* @date 2020-05-13 22:37:12
* @param [assessUser]
* @return void
@ -44,7 +44,7 @@ public interface AssessUserService {
/**
* @description 更新数据
* @author Mr.Xu
* @author
* @date 2020-05-14 22:03:02
* @param [assessUser]
* @return void
@ -53,7 +53,7 @@ public interface AssessUserService {
/**
* @description 根据assessUserId获取答题总表
* @author Mr.Xu
* @author
* @date 2020-06-01 21:51:09
* @param [assessUserId]
* @return com.blockchain.server.user.entity.AssessUser

2
blockchain-server/blockchain-server-user/src/main/java/com/blockchain/server/user/service/impl/AssessUserServiceImpl.java
Unescape View File

@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className AssessUserServiceImpl
* @description 学生用户考核信息表 服务实现类

10
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/TeachingGradeController.java
Unescape View File

@ -40,7 +40,7 @@ import java.util.List;
import java.util.Map;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className TeachingGradeController
* @description 练习、考核成绩Controller
@ -69,7 +69,7 @@ public class TeachingGradeController {
/**
* @description 教师获取考核概况
* @author huan.xu
* @author haotian
* @date 2020-05-19 10:47:29
* @param [issueId, totalNum, caseId, response]
* @return void
@ -148,7 +148,7 @@ public class TeachingGradeController {
* @param [issueId, notExamNum]
* @return java.util.Map<java.lang.String, java.lang.Object>
* @description 封装错误率
* @author huan.xu
* @author haotian
* @date 2019-11-08 18:27:22
**/
private Map<String, Object> getWrongStatistics(String issueId, Integer totalNum, List<TrainCaseTargetDto> trainCaseTargeList) {
@ -311,7 +311,7 @@ public class TeachingGradeController {
* @param [issueId, authorization]
* @return java.util.Map<java.lang.String, java.lang.Object>
* @description 重新成绩同步
* @author huan.xu
* @author haotian
* @date 2019-11-08 18:39:55
**/
@GetMapping("/studyGrade/reSynchroze")
@ -541,7 +541,7 @@ public class TeachingGradeController {
* @param [cell, wb, str, startIndex, endIndex]
* @return void
* @description poi实现单元格中部分字体颜色设定
* @author huan.xu
* @author haotian
* @date 2019-12-10 16:19:48
**/
private void setFontColor(HSSFWorkbook wb, HSSFCell cell, String str, int startIndex, int endIndex) {

31
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/YyyfMoneyController.java
Unescape View File

@ -3,7 +3,6 @@ package com.blockchain.server.yyyf.controller;
import com.blockchain.common.base.dto.ResultDTO;
import com.blockchain.server.yyyf.controller.api.YyyfMoneyApi;
import com.blockchain.server.yyyf.dto.TransactResultDto;
import com.blockchain.server.yyyf.entity.YyyfMoney;
import com.blockchain.server.yyyf.service.YyyfMoneyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -19,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
/**
* @author Mr.Xu
* @author
* @version 1.0
* @className MoneyController
* @description
@ -46,4 +45,32 @@ public class YyyfMoneyController {
return ResultDTO.requstSuccess(transactResultDto);
}
@PostMapping("/resetDigitWallet")
@ApiOperation(value = YyyfMoneyApi.ResetDigitWallet.METHOD_NAME,
notes = YyyfMoneyApi.ResetDigitWallet.METHOD_NOTE)
public ResultDTO<Boolean> resetDigitWallet(@ApiParam(YyyfMoneyApi.ResetDigitWallet.METHOD_ASSESS_USER_ID) @RequestParam(name = "assessUserId",required =true) String assessUserId,
@ApiParam(YyyfMoneyApi.ResetDigitWallet.METHOD_COIN_NAME) @RequestParam(name = "coinName",required =true)String coinName,
@ApiParam(YyyfMoneyApi.ResetDigitWallet.METHOD_BALANCE) @RequestParam(name = "balance",required =true) BigDecimal balance) {
boolean result=this.yyyfMoneyService.resetDigitWallet(assessUserId,coinName,balance);
return ResultDTO.requstSuccess(result);
}
@PostMapping("/resetWallet")
@ApiOperation(value = YyyfMoneyApi.ResetWallet.METHOD_NAME,
notes = YyyfMoneyApi.ResetWallet.METHOD_NOTE)
public ResultDTO<Boolean> resetWallet(@ApiParam(YyyfMoneyApi.ResetWallet.METHOD_ASSESS_USER_ID) @RequestParam(name = "assessUserId",required =true) String assessUserId,
@ApiParam(YyyfMoneyApi.ResetWallet.METHOD_COIN_NAME) @RequestParam(name = "coinName",required =true)String coinName,
@ApiParam(YyyfMoneyApi.ResetWallet.METHOD_BALANCE) @RequestParam(name = "balance",required =true) BigDecimal balance,
@ApiParam(YyyfMoneyApi.ResetWallet.METHOD_PAY_TYPE) @RequestParam(name = "payType",required =true) String payType,
@ApiParam(YyyfMoneyApi.ResetWallet.METHOD_PAY_MONENY) @RequestParam(name = "payMoney",required =true) BigDecimal payMoney) {
boolean result=this.yyyfMoneyService.resetWallet(assessUserId,coinName,balance,payType,payMoney);
return ResultDTO.requstSuccess(result);
}
}

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/api/TeachingGradeApi.java
Unescape View File

@ -1,7 +1,7 @@
package com.blockchain.server.yyyf.controller.api;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className TeachingGradeApi
* @description

24
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/controller/api/YyyfMoneyApi.java
Unescape View File

@ -1,7 +1,7 @@
package com.blockchain.server.yyyf.controller.api;
/**
* @author Mr.Xu
* @author
* @version 1.0
* @className MoneyApi
* @description
@ -17,4 +17,26 @@ public class YyyfMoneyApi {
public static final String METHOD_IN="转入币种";
public static final String METHOD_AMOUNT="转入金额";
}
public static class ResetWallet {
public static final String METHOD_NAME = "法币交易";
public static final String METHOD_NOTE = "balance为负数是是减少，正数是增加";
public static final String METHOD_ASSESS_USER_ID= "assessUser的主键ID";
public static final String METHOD_COIN_NAME="货币名称";
public static final String METHOD_BALANCE="个数";
public static final String METHOD_PAY_TYPE = "支付类型";
public static final String METHOD_PAY_MONENY = "支付金额";
}
public static class ResetDigitWallet {
public static final String METHOD_NAME = "充币";
public static final String METHOD_NOTE = "balance、payMoney为负数是是减少，正数是增加";
public static final String METHOD_ASSESS_USER_ID= "assessUser的主键ID";
public static final String METHOD_COIN_NAME="货币名称";
public static final String METHOD_BALANCE="个数";
}
}

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/AssessUserDto.java
Unescape View File

@ -8,7 +8,7 @@ import java.io.Serializable;
import java.util.List;
/**
* @author Mr.Xu
* @author
* @version 1.0
* @className AssessUserDto
* @description

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/ExamDetailsDto.java
Unescape View File

@ -10,7 +10,7 @@ import java.io.Serializable;
import java.util.List;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className ExamDetailsDto
* @description

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/OverviewDto.java
Unescape View File

@ -9,7 +9,7 @@ import java.io.Serializable;
import java.util.List;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className OverviewDto
* @description

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/ReExamOverviewDto.java
Unescape View File

@ -7,7 +7,7 @@ import lombok.Data;
import java.io.Serializable;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className ReExamOverviewDto
* @description

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/TransactResultDto.java
Unescape View File

@ -7,7 +7,7 @@ import lombok.Data;
import java.math.BigDecimal;
/**
* @author Mr.Xu
* @author
* @version 1.0
* @className TransactDto
* @description

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/UserTimeMoneyDto.java
Unescape View File

@ -11,7 +11,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @author Mr.Xu
* @author
* @version 1.0
* @className UserTimeMoneyDto
* @description 包含以渔有方userId、本系统userId、开始时间以及各个币种余额情况

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/dto/YyyfStudentAnswerDto.java
Unescape View File

@ -8,7 +8,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @author Mr.Xu
* @author
* @version 1.0
* @className YyyfStudentAnswerDto
* @description

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/entity/YyyfMoney.java
Unescape View File

@ -10,7 +10,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @author Mr.Xu
* @author
* @version 1.0
* @className YyyfMoney
* @description

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/indicators/IndicatorsUtils.java
Unescape View File

@ -8,7 +8,7 @@ import javax.persistence.EntityExistsException;
import java.util.List;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className IndicatorsUtils
* @description

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/indicators/dto/LastAndFirstAssetsDto.java
Unescape View File

@ -1,7 +1,7 @@
package com.blockchain.server.yyyf.indicators.dto;
import lombok.Data;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className LastAndFirstAssetsReporterDto
* @description

6
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/mapper/AssessUserMapper.java
Unescape View File

@ -24,7 +24,7 @@ public interface AssessUserMapper extends Mapper<AssessUser> {
/**
* @description 通过AssessUserDtoLis批量更新AssessUser
* @author Mr.Xu
* @author
* @date 2020-05-15 00:08:17
* @param [assessUserDtoList]
* @return void
@ -35,7 +35,7 @@ public interface AssessUserMapper extends Mapper<AssessUser> {
/**
* @description 获取未提交的 UserTimeMoneyDto List
* @author Mr.Xu
* @author
* @date 2020-06-01 22:05:09
* @param []
* @return java.util.List<com.blockchain.server.yyyf.dto.UserTimeMoneyDto>
@ -44,7 +44,7 @@ public interface AssessUserMapper extends Mapper<AssessUser> {
/**
* @description assessUserId通过assessUserId 获取余额情况
* @author Mr.Xu
* @author
* @date 2020-06-02 21:07:23
* @param [assessUserId]
* @return com.blockchain.server.yyyf.dto.UserTimeMoneyDto

4
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/mapper/AssessUserTargetMapper.java
Unescape View File

@ -16,7 +16,7 @@ public interface AssessUserTargetMapper extends Mapper<AssessUserTarget> {
/**
* @description 批量插入指标
* @author Mr.Xu
* @author
* @date 2020-05-14 23:24:21
* @param [list]
* @return void
@ -29,7 +29,7 @@ public interface AssessUserTargetMapper extends Mapper<AssessUserTarget> {
/**
* @description 批量更新指标库最终答题情况
* @author Mr.Xu
* @author
* @date 2020-06-01 22:54:19
* @param [updateAssessUserTargetList]
* @return void

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/mapper/YyyfMoneyMapper.java
Unescape View File

@ -5,7 +5,7 @@ import org.springframework.stereotype.Repository;
import tk.mybatis.mapper.common.Mapper;
/**
* @author Mr.Xu
* @author
* @version 1.0
* @className YyyfMoneyMapper
* @description

16
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/service/AssessUserService.java
Unescape View File

@ -10,7 +10,7 @@ import java.util.List;
/**
* @param
* @author huan.xu
* @author haotian
* @description 学生用户考核信息表 服务接口类
* @date 2019-10-31 14:36:49
* @return
@ -34,7 +34,7 @@ public interface AssessUserService {
/**
* @description 插入
* @author Mr.Xu
* @author
* @date 2020-05-13 22:37:12
* @param [assessUser]
* @return void
@ -43,7 +43,7 @@ public interface AssessUserService {
/**
* @description 初始化考核数据
* @author Mr.Xu
* @author
* @date 2020-05-14 22:03:38
* @param [assessUser, trainCaseTargeList]
* @return void
@ -52,7 +52,7 @@ public interface AssessUserService {
/**
* @description 更新数据
* @author Mr.Xu
* @author
* @date 2020-05-14 22:03:02
* @param [assessUser]
* @return void
@ -61,7 +61,7 @@ public interface AssessUserService {
/**
* @description 提交事务
* @author Mr.Xu
* @author
* @date 2020-05-14 22:24:29
* @param [assessUserId]
* @return void
@ -70,7 +70,7 @@ public interface AssessUserService {
/**
* @description 批量同步成绩
* @author Mr.Xu
* @author
* @date 2020-05-14 23:21:20
* @param [issueId]
* @return void
@ -91,7 +91,7 @@ public interface AssessUserService {
/**
* @description 获取未提交的 UserTimeMoneyDto List
* @author Mr.Xu
* @author
* @date 2020-06-01 22:05:09
* @param []
* @return java.util.List<com.blockchain.server.yyyf.dto.UserTimeMoneyDto>
@ -100,7 +100,7 @@ public interface AssessUserService {
/**
* @description assessUserId通过assessUserId 获取余额情况
* @author Mr.Xu
* @author
* @date 2020-06-02 21:06:35
* @param [assessUserId]
* @return com.blockchain.server.yyyf.dto.UserTimeMoneyDto

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/service/AssessUserTargetService.java
Unescape View File

@ -35,7 +35,7 @@ public interface AssessUserTargetService{
/**
* @description 还原指标表
* @author Mr.Xu
* @author
* @date 2020-06-03 00:05:17
* @param [assessUserId]
* @return void

4
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/service/impl/AssessUserServiceImpl.java
Unescape View File

@ -36,7 +36,7 @@ import java.util.*;
import java.util.concurrent.TimeUnit;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className AssessUserServiceImpl
* @description 学生用户考核信息表 服务实现类
@ -308,7 +308,7 @@ public class AssessUserServiceImpl implements AssessUserService {
* @param [assessUserTarget, targetResultMap]
* @return void
* @description 计算是否达标
* @author Mr.Xu
* @author
* @date 2020-06-01 22:49:37
**/
private void answerResultForTarget(AssessUserTarget assessUserTarget, Map<String, Float> targetResultMap) {

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/utils/HttpClientUtil.java
Unescape View File

@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
/**
* @author huan.xu
* @author haotian
* @version 1.0
* @className HttpClientUtil
* @description

2
blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/utils/IdGenerator.java
Unescape View File

@ -3,7 +3,7 @@ package com.blockchain.server.yyyf.utils;
import java.util.UUID;
/**
* @author Mr.Xu
* @author
* @version 1.0
* @className IdGenerator
* @description

Write Preview
Loading…
Cancel
Save