winter il y a 1 an
Parent
révision
7aa08952ef
5 fichiers modifiés avec 18 ajouts et 16 suppressions
  1. +2
    -2
      suimangAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java
  2. +1
    -1
      suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java
  3. +1
    -1
      suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java
  4. +1
    -1
      suimangService/src/main/java/com/iformall/service/sm/UserMouldVideoService.java
  5. +13
    -11
      suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java

+ 2
- 2
suimangAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java Voir le fichier

@@ -23,8 +23,8 @@ public class PasswordHelper {


public static void main(String[] args) { public static void main(String[] args) {
MallUserInfo user = new MallUserInfo(); MallUserInfo user = new MallUserInfo();
user.setUsername("localtest");
user.setPassword("123456");
user.setUsername("smadmin");
user.setPassword("sm2023@1");
PasswordHelper passwordHelper = new PasswordHelper(); PasswordHelper passwordHelper = new PasswordHelper();
passwordHelper.encryptPassword(user); passwordHelper.encryptPassword(user);
System.out.println(user); System.out.println(user);


+ 1
- 1
suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java Voir le fichier

@@ -82,7 +82,7 @@ public class CallbackSmController extends BaseController {
userMouldVideoService.updateById(videoUnd); userMouldVideoService.updateById(videoUnd);
} }


userMouldVideoService.uploadVideo(videoUnd);
userMouldVideoService.uploadVideo(videoUnd,true);
return new ResultData(); return new ResultData();
} }


+ 1
- 1
suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java Voir le fichier

@@ -79,7 +79,7 @@ public class VideoSchedule {
if (videos != null && videos.size() > 0) { if (videos != null && videos.size() > 0) {
for (UserMouldVideo video : videos) { for (UserMouldVideo video : videos) {
try { try {
userMouldVideoService.uploadVideo(video);
userMouldVideoService.uploadVideo(video,true);
} catch (Exception e) { } catch (Exception e) {
logger.error("TtCouponVideoSchedule error.couponVideoSchedule:"+video.getId(),e); logger.error("TtCouponVideoSchedule error.couponVideoSchedule:"+video.getId(),e);
} }


+ 1
- 1
suimangService/src/main/java/com/iformall/service/sm/UserMouldVideoService.java Voir le fichier

@@ -47,7 +47,7 @@ public interface UserMouldVideoService {


Future createVideo(UserMouldVideo mouldVideo); Future createVideo(UserMouldVideo mouldVideo);


void uploadVideo(UserMouldVideo mouldVideo);
void uploadVideo(UserMouldVideo mouldVideo,boolean finisedAndCost);


UserMouldVideo findVideo(Long id); UserMouldVideo findVideo(Long id);




+ 13
- 11
suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java Voir le fichier

@@ -439,7 +439,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
this.saveOrUpdate(videoUpd); this.saveOrUpdate(videoUpd);


videoUpd.setTitle(mouldVideo.getTitle()); videoUpd.setTitle(mouldVideo.getTitle());
this.uploadVideo(videoUpd);
this.uploadVideo(videoUpd,false);


return new AsyncResult<>(1); return new AsyncResult<>(1);
} }
@@ -460,7 +460,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {


@Async @Async
@Override @Override
public void uploadVideo(UserMouldVideo mouldVideo){
public void uploadVideo(UserMouldVideo mouldVideo,boolean finisedAndCost){
String lockKey = "oralBroadcasting:handleVideo:"+mouldVideo.getId(); String lockKey = "oralBroadcasting:handleVideo:"+mouldVideo.getId();
long time = System.currentTimeMillis() + 30000; long time = System.currentTimeMillis() + 30000;
String timeStr = String.valueOf(time); String timeStr = String.valueOf(time);
@@ -510,15 +510,17 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
videoUpd.setVideoStatus(EnumVideoStatus.upload_success.getCode()); videoUpd.setVideoStatus(EnumVideoStatus.upload_success.getCode());
videoUpd.setVideoMsg("视频上传成功"); videoUpd.setVideoMsg("视频上传成功");
videoUpd.setUpdateDate(new Date()); videoUpd.setUpdateDate(new Date());
//设置扣费,当前方法是慧影项目专用的
if (StringUtils.isBlank(videoUpd.getVideoTime())) {
break;
}
CreateBilling cb = projectFactory.getProjectService(EnumProject.PROJECT_2.getCode())
.handleCreateVideoBilling(userMouldVideo.getUserId(), userMouldVideo.getFinalTenantId(), videoUpd.getVideoTime(), videoUpd.getVideoSize());
if (null != cb) {
videoUpd.setCostPoints(cb.getTotalCostPoins());
videoUpd.setCostPointsDetail(cb.getDetail());
if (finisedAndCost) {
//设置扣费,当前方法是慧影项目专用的
if (StringUtils.isBlank(videoUpd.getVideoTime())) {
break;
}
CreateBilling cb = projectFactory.getProjectService(EnumProject.PROJECT_2.getCode())
.handleCreateVideoBilling(userMouldVideo.getUserId(), userMouldVideo.getFinalTenantId(), videoUpd.getVideoTime(), videoUpd.getVideoSize());
if (null != cb) {
videoUpd.setCostPoints(cb.getTotalCostPoins());
videoUpd.setCostPointsDetail(cb.getDetail());
}
} }
this.updateById(videoUpd); this.updateById(videoUpd);
break; break;


Chargement…
Annuler
Enregistrer