视频说明书

bladex-tool/blade-starter-mybatis/pom.xml

@@ -60,6 +60,10 @@
             <artifactId>blade-core-auto</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

bladex-tool/blade-starter-mybatis/src/main/java/org/springblade/core/mp/BladeMetaObjectHandler.java → bladex-tool/blade-starter-mybatis/src/main/java/org/springblade/core/mp/config/BladeMetaObjectHandler.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.core.mp;
+package org.springblade.core.mp.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import lombok.extern.slf4j.Slf4j;

bladex-tool/blade-starter-mybatis/src/main/java/org/springblade/core/mp/config/MybatisPlusConfiguration.java

@@ -16,8 +16,10 @@
  */
 package org.springblade.core.mp.config;
 
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
+import com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
@@ -27,7 +29,6 @@ import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springblade.core.launch.props.BladePropertySource;
-import org.springblade.core.mp.BladeMetaObjectHandler;
 import org.springblade.core.mp.injector.BladeSqlInjector;
 import org.springblade.core.mp.intercept.QueryInterceptor;
 import org.springblade.core.mp.plugins.BladePaginationInterceptor;
@@ -147,5 +148,17 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer {
         return new BladeMetaObjectHandler();
     }
 
+    /**
+     * map返回查询结果时，自动转驼峰
+     * <p>
+     * updateUser 张利杰
+     * updateTime 2022-08-10
+     * </p>
+     */
+    @Bean
+    public ConfigurationCustomizer configurationCustomizer() {
+        return i -> i.setObjectWrapperFactory(new MybatisMapWrapperFactory());
+    }
+
 }
 

hx-common/common-video/src/main/java/com/fjhx/controller/video/VideoInfoController.java

@@ -51,5 +51,11 @@ public class VideoInfoController {
         return R.success();
     }
 
+    @PostMapping("/details")
+    public R details(@RequestBody VideoInfoVo videoInfoVo) {
+        Map<String, Object> result = videoInfoService.details(videoInfoVo);
+        return R.success(result);
+    }
+
 }
 

hx-common/common-video/src/main/java/com/fjhx/service/video/VideoInfoService.java

@@ -25,4 +25,6 @@ public interface VideoInfoService extends BaseService<VideoInfo> {
 
     void delete(VideoInfoVo videoInfoVo);
 
+    Map<String, Object> details(VideoInfoVo videoInfoVo);
+
 }

hx-common/common-video/src/main/java/com/fjhx/service/video/impl/VideoInfoServiceImpl.java

@@ -12,6 +12,7 @@ import com.fjhx.mapper.video.VideoInfoMapper;
 import com.fjhx.params.video.VideoInfoVo;
 import com.fjhx.service.video.VideoClassifyService;
 import com.fjhx.service.video.VideoInfoService;
+import com.fjhx.utils.Assert;
 import com.fjhx.utils.FileClientUtil;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -104,6 +105,9 @@ public class VideoInfoServiceImpl extends ServiceImpl<VideoInfoMapper, VideoInfo
         // TODO 类型未定，目前先赋值已发布
         videoInfoVo.setStatus(2);
 
+        // 播放量
+        videoInfoVo.setPlaybackVolume(0L);
+
         // 变更分类视频数量
         updateClassifyVideoNum(null, videoInfoVo.getVideoClassifyId(), videoInfoVo.getVideoNum());
 
@@ -145,6 +149,19 @@ public class VideoInfoServiceImpl extends ServiceImpl<VideoInfoMapper, VideoInfo
 
     }
 
+    @Override
+    public Map<String, Object> details(VideoInfoVo videoInfoVo) {
+        Long id = videoInfoVo.getId();
+        Assert.notEmpty(id, "id不能为空");
+
+        Map<String, Object> map = getMap(Wrappers.<VideoInfo>lambdaQuery().eq(BaseEntity::getId, id));
+        List<FileInfo> fileInfoList = FileClientUtil.getFileInfoList(id);
+
+        map.put("fileInfo", fileInfoList);
+
+        return map;
+    }
+
     /**
      * 保存视频信息
      */

hx-service/storage/src/main/java/com/fjhx/apply/mapper/ApplyPurchaseMapper.xml

@@ -43,20 +43,20 @@
 
     <select id="getPage" resultType="java.util.LinkedHashMap">
         select apd.ApplyBillNo,
-               m.Code              materialCode,
-               m.Name              materialName,
-               m.Spec              spec,
-               ap.CreatedTime      applyTime,
-               apd.PurchaseQty     purchaseQty,
-               m.SafetyStock       safetyQty,
-               apd.Purpose         purpose,
+               m.Code                         materialCode,
+               m.Name                         materialName,
+               m.Spec                         spec,
+               ap.CreatedTime                 applyTime,
+               apd.PurchaseQty                purchaseQty,
+               m.SafetyStock                  safetyQty,
+               apd.Purpose                    purpose,
                (select pc.PurchaseQty - sum(st.Quantity)
                 from stock_tag st
                 where st.PurchaseBillNo = pc.PurchaseBillNo
                   and pc.PurContractState != 3
-               )                   onWayQuantity,
-               pc.PurContractState purContractState,
-               ap.ApplyAccount     applyAccount
+               )                              onWayQuantity,
+               ifnull(pc.PurContractState, 0) purContractState,
+               ap.ApplyAccount                applyAccount
         from apply_purchase ap
                  inner join apply_purchasedetail apd on ap.ApplyBillNo = apd.ApplyBillNo
                  left join material m on apd.MaterialCode = m.Code

hx-service/storage/src/main/java/com/fjhx/apply/service/impl/ApplyPurchaseServiceImpl.java

@@ -139,8 +139,6 @@ public class ApplyPurchaseServiceImpl extends ServiceImpl<ApplyPurchaseMapper, A
             wrapper.eq(ObjectUtil.isNotEmpty(technologyType), "m.TechnologyType", technologyType);
         }
 
-        wrapper.isNotNull("pc.PurContractState");
-
         wrapper.groupBy("ap.ApproveBillState");
 
         List<Map<String, Object>> list = baseMapper.numStatistics(wrapper);
@@ -229,8 +227,6 @@ public class ApplyPurchaseServiceImpl extends ServiceImpl<ApplyPurchaseMapper, A
             wrapper.eq(ObjectUtil.isNotEmpty(technologyType), "m.TechnologyType", technologyType);
         }
 
-        wrapper.isNotNull("pc.PurContractState");
-
         wrapper.eq(ObjectUtil.isNotEmpty(status), "ap.ApproveBillState", status);
         wrapper.orderByAsc("pc.PurContractState");
         wrapper.orderByDesc("ap.CreatedTime");