bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/model/ExhibitionBoard.java

@@ -124,6 +124,10 @@ public class ExhibitionBoard implements Serializable {
     @TableField(exist = false)
     private String assetName;
 
+    @ApiModelProperty("展板视频URL")
+    @TableField(exist = false)
+    private String videoUrl;
+
     @ApiModelProperty("展板视频URL列表")
     @TableField(exist = false)
     private List<String> videoUrlList;

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -3,7 +3,6 @@ package cn.wisenergy.chnmuseum.party.web.controller;
 import cn.wisenergy.chnmuseum.party.auth.SHA256PasswordEncryptionService;
 import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
 import cn.wisenergy.chnmuseum.party.common.enums.LanguageEnum;
-import cn.wisenergy.chnmuseum.party.common.util.DateUtil;
 import cn.wisenergy.chnmuseum.party.common.util.TimeUtils;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.vo.AudioVo;
@@ -61,9 +60,6 @@ public class ChinaMobileRestApiController extends BaseController {
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 
-    @Resource
-    private EmployeeServiceImpl employeeService;
-
     @Resource
     private TUserServiceImpl userService;
 
@@ -73,9 +69,6 @@ public class ChinaMobileRestApiController extends BaseController {
     @Resource
     private RunLogServiceImpl runLogService;
 
-    @Resource
-    private SysLogController sysLogController;
-
     @Resource
     private TAreaServiceImpl areaService;
 
@@ -121,6 +114,31 @@ public class ChinaMobileRestApiController extends BaseController {
     //用户登录是否被锁定    一小时 redisKey 前缀
     private static final String SHIRO_IS_LOCK = "shiro_is_lock_";
 
+    /**
+     * 机顶盒激活状态查询
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "获取机顶盒密钥", notes = "获取机顶盒密钥")
+    @GetMapping("/equitment/key")
+    @RequiresPermissions("equitment:key")
+    public Map<String, Object> getBoxPrivateKey(@RequestParam(value = "mac") String mac) {
+        try {
+            final LambdaQueryWrapper<TBoxOperation> queryWrapper = Wrappers.<TBoxOperation>lambdaQuery().eq(TBoxOperation::getMac, mac.trim().toUpperCase());
+            final TBoxOperation tBoxOperation = this.boxOperationService.getOne(queryWrapper);
+            if (tBoxOperation != null) {
+                final String organId = tBoxOperation.getOrganId();
+
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return getFailResult();
+    }
+
     /**
      * 机顶盒激活状态查询
      *

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -347,6 +347,7 @@ public class ExhibitionBoardController extends BaseController {
             final String videoUrl = asset.getVideoUrl();
             final List<VideoVo> videoVoList = JSONObject.parseObject(videoUrl, new TypeReference<List<VideoVo>>() {
             }, Feature.OrderedField);
+            exhibitionBoard.setVideoUrl(videoUrl);
             exhibitionBoard.setVideoUrlList(videoVoList.stream().map(VideoVo::getFileUrl).collect(Collectors.toList()));
         }
         return getResult(exhibitionBoard);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java

@@ -357,6 +357,7 @@ public class LearningContentController extends BaseController {
                 final String videoUrl = asset.getVideoUrl();
                 final List<VideoVo> videoVoList = JSONObject.parseObject(videoUrl, new TypeReference<List<VideoVo>>() {
                 }, Feature.OrderedField);
+                exhibitionBoard.setVideoUrl(videoUrl);
                 exhibitionBoard.setVideoUrlList(videoVoList.stream().map(VideoVo::getFileUrl).collect(Collectors.toList()));
             }
         }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
+import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
 import cn.wisenergy.chnmuseum.party.model.TUser;
+import cn.wisenergy.chnmuseum.party.service.TBoxOperationService;
 import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
+import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
-import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
-import cn.wisenergy.chnmuseum.party.service.TBoxOperationService;
-
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -44,7 +40,6 @@ public class TBoxOperationController extends BaseController {
     @Resource
     private TUserServiceImpl userService;
 
-
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
@@ -55,7 +50,7 @@ public class TBoxOperationController extends BaseController {
     @PostMapping("/selectPageList")
     @RequiresPermissions("/boxOperation/selectPageList")
     @ApiOperation(value = "获取机顶盒基础信息分页列表", notes = "获取机顶盒基础信息分页列表")
-    public Map<String, Object> selectPageList(String organId,String areaId) {
+    public Map<String, Object> selectPageList(String organId, String areaId) {
         TUser user1 = getcurUser();
         TUser user = new TUser();
         if (StringUtils.isNotBlank(organId)) {
@@ -67,9 +62,8 @@ public class TBoxOperationController extends BaseController {
         }
         //设置数据权限
         user.setOrgCode(user1.getOrgCode());
-        Page<TBoxOperation> page = null;
         try {
-            page = tBoxOperationService.selectBoxPage(getPage(), user);
+            Page<TBoxOperation> page = tBoxOperationService.selectBoxPage(getPage(), user);
             return getResult(page);
         } catch (Exception e) {
             e.printStackTrace();
@@ -82,10 +76,11 @@ public class TBoxOperationController extends BaseController {
     @ApiOperation(value = "添加机顶盒运维信息", notes = "添加机顶盒运维信息")
     public Map<String, Object> saveTBoxOperation(TBoxOperation tBoxOperation) {
         // 保存业务节点信息
-        tBoxOperation.setCreateTime(LocalDateTime.now());
-        tBoxOperation.setUpdateTime(LocalDateTime.now());
-        boolean result = false;
+        boolean result;
         try {
+            if (tBoxOperation != null && StringUtils.isNotBlank(tBoxOperation.getMac())) {
+                tBoxOperation.setMac(tBoxOperation.getMac().toUpperCase());
+            }
             result = tBoxOperationService.save(tBoxOperation);
             if (!result) {
                 return getFailResult();
@@ -102,16 +97,17 @@ public class TBoxOperationController extends BaseController {
     @RequiresPermissions("/boxOperation/update")
     @ApiOperation(value = "修改机顶盒运维信息信息", notes = "修改机顶盒运维信息信息")
     public Map<String, Object> updateTBoxOperation(TBoxOperation tBoxOperation) {
-
         try {
-			tBoxOperation.setUpdateTime(LocalDateTime.now());
+            if (tBoxOperation != null && StringUtils.isNotBlank(tBoxOperation.getMac())) {
+                tBoxOperation.setMac(tBoxOperation.getMac().toUpperCase());
+            }
             boolean flag = tBoxOperationService.updateById(tBoxOperation);
             UpdateWrapper<TUser> wrapper = new UpdateWrapper<>();
-			wrapper.eq("org_id",tBoxOperation.getOrganId());
-			wrapper.eq("type","3");
+            wrapper.eq("org_id", tBoxOperation.getOrganId());
+            wrapper.eq("type", "3");
             TUser user = userService.getOne(wrapper);
             String password = user.getPassword();
-			if (flag&&user!=null) {
+            if (flag) {
                 return getResult(password);
             }
             return getFailResult();
@@ -127,7 +123,7 @@ public class TBoxOperationController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "query", dataType = "String")
     })
     public Map<String, Object> deleteTBoxOperation(String id) {
-        boolean result = false;
+        boolean result;
         try {
             result = tBoxOperationService.removeById(id);
             if (!result) {
@@ -149,7 +145,7 @@ public class TBoxOperationController extends BaseController {
         //设置数据权限
         String areaId = user.getAreaId();
         try {
-            tBoxOperationList = tBoxOperationService.getList(status,getAreaId(areaId));
+            tBoxOperationList = tBoxOperationService.getList(status, getAreaId(areaId));
             return getResult(tBoxOperationList);
         } catch (Exception e) {
             e.printStackTrace();
@@ -209,11 +205,10 @@ public class TBoxOperationController extends BaseController {
     }
 
 
-
-    public String getAreaId(String areaId){
+    public String getAreaId(String areaId) {
         if ("0000".equals(areaId.substring(2))) {
             areaId = areaId.substring(0, 2);
-        }else if ("00".equals(areaId.substring(4))) {
+        } else if ("00".equals(areaId.substring(4))) {
             areaId = areaId.substring(0, 4);
         }
         return areaId;