Merge remote-tracking branch 'origin/yxz' into yxz

xyzc-start/src/main/java/com/xyzc/start/controller/NumPersonController.java

@@ -285,7 +285,7 @@ public class NumPersonController {
     @PostMapping("/getCommonTemplate")
     @ResponseBody
     public Result<Page<NpFormwork>> getCommonTemplate(@RequestBody NpRequestParams npRequestParams) {
-        Page<NpFormwork> commonTemplate = npQueryService.getCommonTemplate(npRequestParams.getType(), npRequestParams.getPage(), npRequestParams.getSize());
+        Page<NpFormwork> commonTemplate = npQueryService.getCommonTemplate(npRequestParams.getFormworkType(), npRequestParams.getType(), npRequestParams.getPage(), npRequestParams.getSize());
         return Result.ok(commonTemplate);
     }
 
@@ -304,7 +304,7 @@ public class NumPersonController {
     /**
      * 更改草稿名称
      */
-    @PostMapping("/udateDraftName")
+    @PostMapping("/updateDraftName")
     @ResponseBody
     public Result<Void> udateDraftName(@RequestBody NpTemplateDraft templateDraft) {
         npCommitService.udateDraftName(templateDraft);

xyzc-start/src/main/java/com/xyzc/start/domain/NpFormwork.java

@@ -54,5 +54,9 @@ public class NpFormwork extends BaseEntity {
      */
     private Integer formworkType;
 
+    /**
+     * 图片Url
+     */
+    private String imgUrl;
 
 }

xyzc-start/src/main/java/com/xyzc/start/mapper/NpTemplateDraftMapper.java

@@ -17,7 +17,7 @@ public interface NpTemplateDraftMapper extends BaseMapper<NpTemplateDraft> {
 
     NpFormwork getTemplateDraft(String templateId);
 
-    Page<NpFormwork>  getCommonTemplate(Long baseUserId, int type, Page<NpFormwork> page);
+    Page<NpFormwork>  getCommonTemplate(Long baseUserId, Integer formworkType, int type, Page<NpFormwork> page);
 
     Page<NpTemplateDraft>  sortDraftByUpdate(Long baseUserId, Page<NpTemplateDraft> page);
 

xyzc-start/src/main/java/com/xyzc/start/request/NpRequestParams.java

@@ -17,6 +17,8 @@ public class NpRequestParams {
 
     Integer type;
 
+    Integer formworkType;
+
     @NotNull(message = "请输入当前页")
     private Integer page;
 

xyzc-start/src/main/java/com/xyzc/start/service/INpQueryService.java

@@ -16,7 +16,7 @@ public interface INpQueryService {
 
     Page<NpSound> queryCompanySound(Integer type, String name, Integer page, Integer size);
 
-    Page<NpFormwork> getCommonTemplate(Integer type, Integer page, Integer size);
+    Page<NpFormwork> getCommonTemplate(Integer formworkType, Integer type, Integer page, Integer size);
 
     Page<NpTemplateDraft> sortDraftByUpdate(Integer page, Integer size);
 

xyzc-start/src/main/java/com/xyzc/start/service/impl/NpQueryServiceImpl.java

@@ -276,7 +276,7 @@ public class NpQueryServiceImpl implements INpQueryService {
     }
 
     @Override
-    public Page<NpFormwork> getCommonTemplate(Integer type, Integer pageNum, Integer size) {
+    public Page<NpFormwork> getCommonTemplate(Integer formworkType, Integer type, Integer pageNum, Integer size) {
         if (type == null) {
 
         }
@@ -288,13 +288,13 @@ public class NpQueryServiceImpl implements INpQueryService {
         }
         Page<NpFormwork> formworkPage = null;
         Page<NpFormwork> page = new Page<>(pageNum, size);
-//        if (1 == type) {
-            formworkPage = npTemplateDraftMapper.getCommonTemplate(null, type, page);
-//        }
-//        if (2 == type) {
-//            Long baseUserId = SecurityUser.getUserId();
-//            formworkPage = npTemplateDraftMapper.getCommonTemplate(baseUserId, type, page);
-//        }
+        if (1 == type) {
+            Long baseUserId = SecurityUser.getUserId();
+            formworkPage = npTemplateDraftMapper.getCommonTemplate(baseUserId, formworkType, type, page);
+        }
+        if (2 == type) {
+            formworkPage = npTemplateDraftMapper.getCommonTemplate(null, formworkType, type, page);
+        }
         return formworkPage;
     }
 

xyzc-start/src/main/resources/mapper/WebStart/NpCommitTrainMapper.xml

@@ -6,7 +6,7 @@
 
     <select id="queryCommitTrain" resultType="com.xyzc.start.domain.NpCommitTrain">
         SELECT
-            "model_id, video_url,title, cover_url, scene_id, robot_json"
+            model_id, video_url,title, cover_url, scene_id, robot_json
         FROM xy_np_commit_train
         <where>
             <if test="baseUserId != null and baseUserId != ''">

xyzc-start/src/main/resources/mapper/WebStart/NpTemplateDraftMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT
                    `id`
                  , `base_user_id`
+                 , `img_url`
                  , `nodes`
                  , `name`
                  , `type`
@@ -26,10 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             FROM xy_np_formwork
             <where>
                 <if test="baseUserId != null and baseUserId != ''">
-                    base_user_id = #{baseUserId} AND
+                    AND base_user_id = #{baseUserId}
                 </if>
                 <if test="type != null and type != ''">
-                    `type` = #{type}
+                    AND `type` = #{type}
+                </if>
+                <if test="formworkType != null and formworkType != ''">
+                    AND `formwork_type` = #{formworkType}
                 </if>
             </where>
     </select>