视频说明书

hx-common/code-generator/src/main/java/com/fjhx/generator/CodeGenerator.java

@@ -40,6 +40,8 @@ public class CodeGenerator {
     public static String USER_NAME = "";
     public static String PASSWORD = "";
 
+    // 业务位置
+    public static String SERVICE_PATH = "hx-service";
 
     public static String BASE_ENTITY_PATH = "com.fjhx.base.BaseEntity";
     public static String BASE_SERVICE_PATH = "com.fjhx.base.BaseService";
@@ -53,7 +55,7 @@ public class CodeGenerator {
         String entityChildren = "/hx-service-api/" + MODULAR_NAME.replace("_", "-") + "-api";
 
         //  业务所在模块
-        String children = "/hx-service/" + MODULAR_NAME.replace("_", "-");
+        String children = "/" + SERVICE_PATH + " / " + MODULAR_NAME.replace(" _ ", " - ");
 
         // 生成的包路径
         String parent = "com.fjhx";

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

@@ -51,6 +51,12 @@ public class VideoInfoServiceImpl extends ServiceImpl<VideoInfoMapper, VideoInfo
                 , VideoInfo::getSize, BaseEntity::getCreateTime, BaseEntity::getUpdateTime
         );
 
+        String classifyId = condition.get("classifyId");
+        if (ObjectUtil.isNotEmpty(classifyId)) {
+            List<Long> childrenIdList = videoClassifyService.getChildrenIdList(Long.valueOf(classifyId));
+            wrapper.lambda().in(VideoInfo::getVideoClassifyId, childrenIdList);
+        }
+
         // 赋值视频地址
         Page<Map<String, Object>> page = pageMaps(createPageMap(condition), wrapper);
         List<Map<String, Object>> records = page.getRecords();

hx-service-api/storage-api/src/main/java/com/fjhx/entity/scheduling/Scheduling.java

@@ -16,6 +16,8 @@
  */
 package com.fjhx.entity.scheduling;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -41,6 +43,7 @@ public class Scheduling {
      * 主键ID
      */
     @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
     /**
      * 是否删除

hx-service/storage-restructure/src/main/java/com/fjhx/scheduling/service/impl/StockAreaServiceImpl.java → hx-service/storage-restructure/src/main/java/com/fjhx/service/stock/impl/StockAreaServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.scheduling.service.impl;
+package com.fjhx.service.stock.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hx-service/storage-restructure/src/main/java/com/fjhx/scheduling/service/impl/StockHouseServiceImpl.java → hx-service/storage-restructure/src/main/java/com/fjhx/service/stock/impl/StockHouseServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.scheduling.service.impl;
+package com.fjhx.service.stock.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hx-service/storage/src/main/java/com/fjhx/scheduling/controller/SchedulingController.java

@@ -21,10 +21,10 @@ import com.fjhx.scheduling.service.ISchedulingService;
 import com.fjhx.utils.HmacUtil;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.*;
-import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.Date;
 
@@ -40,18 +40,19 @@ import java.util.Date;
 @Api(value = "仓库", tags = "仓库接口")
 public class SchedulingController extends BladeController {
 
-	private final ISchedulingService schedulingService;
+    private final ISchedulingService schedulingService;
+
+    /**
+     * 新增
+     */
+    @PostMapping("/save")
+    public R save(@RequestBody Scheduling scheduling, @RequestHeader("Authority") String authority, @RequestHeader("date") String date) {
+        if (!StringUtil.equals(HmacUtil.encrypt("fjhx" + date, "fjhx@2012"), authority)) {
+            return R.fail("无权限");
+        }
+        scheduling.setCreateTime(new Date());
+        scheduling.setId(null);
+        return R.status(schedulingService.save(scheduling));
+    }
 
-	/**
-	 * 新增
-	 */
-	@PostMapping("/save")
-	public R save(@RequestBody Scheduling scheduling,@RequestHeader("Authority")String authority,@RequestHeader("date")String date) {
-		if(!StringUtil.equals(HmacUtil.encrypt("fjhx"+date, "fjhx@2012"),authority)){
-			return R.fail("无权限");
-		}
-		scheduling.setCreateTime(new Date());
-		return R.status(schedulingService.save(scheduling));
-	}
-	
 }