feat：新增标签排序号

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/controller/backend/GoodsLibraryController.java

@@ -3,6 +3,7 @@ package com.zrqx.resource.controller.backend;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.zrqx.base.token.TokenManager;
 import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.page.PageInfo;
@@ -85,7 +86,7 @@ public class GoodsLibraryController {
     }
     @ApiOperation(value = "新增资源集并批量关联资源", notes = "新增资源集并批量关联资源")
     @PostMapping(value = "/save1")
-    public CallBack<Boolean> save1(@RequestBody SaveGoodsLibraryForm form) {
+    public CallBack<Boolean> save1(@RequestBody SaveGoodsLibraryForm form) throws JsonProcessingException {
         if (!service.save1(form)) {
             throw new ResourceBizException("操作失败");
         }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/controller/backend/LabelController.java

@@ -10,6 +10,8 @@ import com.zrqx.resource.exception.ResourceBizException;
 import com.zrqx.resource.model.form.label.QueryLabelListForm;
 import com.zrqx.resource.model.form.label.SaveUpdateLabelContentForm;
 import com.zrqx.resource.model.form.label.SaveUpdateLabelForm;
+import com.zrqx.resource.model.po.diytype.DiyType;
+import com.zrqx.resource.model.po.label.LabelContentDiyType;
 import com.zrqx.resource.model.vo.label.*;
 import com.zrqx.resource.service.LabelContentDiyTypeService;
 import com.zrqx.resource.service.LabelDataTypeService;
@@ -104,7 +106,17 @@ public class LabelController {
         }
         return CallBack.success();
     }
-
+    @ApiOperation(value = "查询自定义标签内容当前最大排序号", notes = "查询当前最大排序号")
+    @GetMapping(value = "/maxOrderNum")
+    public CallBack<Integer> getMaxOrderNum(Integer labelId) {
+        return CallBack.success(service.getMaxOrderNum(labelId));
+    }
+    @ApiOperation(value = "更新排序自定义标签内容", notes = "根据ID更新排序")
+    @PostMapping(value = "/update/sort")
+    public CallBack<Boolean> updateSort(@RequestBody LabelContentDiyType entity) {
+        labelContentDiyTypeService.updateById(entity);
+        return CallBack.success(true);
+    }
     @ApiOperation(value = "更新标签内容", notes = "0:成功；1：id不能为空；2：标签id不能为空；3：父类id不能为空；4：标签内容不能为空；5：同级已存在该标签内容")
     @PostMapping(value = "/content/update")
     public CallBack<Boolean> update(@RequestBody SaveUpdateLabelContentForm entity) {

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/mapper/label/LabelContentDiyTypeMapper.java

@@ -117,4 +117,11 @@ public interface LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTyp
             + "</if>"
             + "</script>")
     List<LabelContentDiyTypeVO> findListByLabelId(@Param("labelId") Integer labelId,@Param("ids") List<String> ids);
+    /**
+     * 查询排序号最大值
+     *
+     * @return
+     */
+    @Select("SELECT sort FROM res_label_content_diy_type WHERE labelId = #{id} ")
+    Integer getMaxOrderNum(Integer id);
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/LabelService.java

@@ -32,4 +32,12 @@ public interface LabelService extends IService<Label> {
     ImportLabelVO importLabelExcel(MultipartFile file, Integer labelId);
 
     List<LabelInfoVO> queryLabelList(QueryLabelListForm form);
+
+    /**
+     * 查询当前最大排序号
+     *
+     * @param id
+     * @return
+     */
+    Integer getMaxOrderNum(Integer id);
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/impl/LabelContentDiyTypeServiceImpl.java

@@ -90,6 +90,7 @@ public class LabelContentDiyTypeServiceImpl extends ServiceImpl<LabelContentDiyT
                 entity.setCode(code);
             }
         }
+        entity.setSort(mapper.getMaxOrderNum(form.getLabelId())+10);
         entity.setCreatedTime(new Date());
         return mapper.insert(entity) > 0;
     }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/impl/LabelServiceImpl.java

@@ -237,7 +237,7 @@ public class LabelServiceImpl extends ServiceImpl<LabelMapper, Label> implements
     public List<LabelInfoVO> queryLabelList(QueryLabelListForm form) {
         List<LabelInfoVO> vo = labelMapper.queryLabelList(form);
         vo.forEach(v -> {
-            PageHelper.orderBy("sort desc");
+            PageHelper.orderBy("sort asc");
             LambdaQueryWrapper<LabelContentDiyType> labelContentDiyTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
             labelContentDiyTypeLambdaQueryWrapper.eq(LabelContentDiyType::getLabelId, v.getLabelId());
             List<LabelContentDiyType> list = labelContentDiyTypeMapper.selectList(labelContentDiyTypeLambdaQueryWrapper);
@@ -248,4 +248,11 @@ public class LabelServiceImpl extends ServiceImpl<LabelMapper, Label> implements
         return vo;
     }
 
+    @Override
+    public Integer getMaxOrderNum(Integer id) {
+        PageHelper.startPage(1, 1, "sort desc");
+        Integer maxOrderNum = labelContentDiyTypeMapper.getMaxOrderNum(id);
+        return maxOrderNum == null ? 10 : maxOrderNum;
+    }
+
 }