From d310587c0ee95ce59ebc7e6a3cb940503f7f9f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E4=BC=8F=E4=BC=BD?= <fujia.chen@hao168.com>
Date: Fri, 20 Oct 2023 17:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BB=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HyPartnerLabelGroupMapper.java     |  2 ++
 .../mapper/HyPartnerLabelGroupMapper.xml      | 11 +++++++
 .../resources/mapper/HyPartnerLabelMapper.xml |  2 +-
 .../java/com/cool/store/vo/LabelGroupVO.java  | 29 +++++++++++++++++++
 .../java/com/cool/store/vo/LabelListVo.java   |  6 ++++
 .../cool/store/service/LabelGroupService.java |  2 ++
 .../com/cool/store/service/LabelService.java  |  4 +--
 .../service/impl/LabelGroupServiceImpl.java   | 11 +++++--
 .../store/service/impl/LabelServiceImpl.java  | 29 ++++++++++++-------
 .../store/controller/LabelController.java     |  6 ++--
 .../controller/LabelGroupController.java      |  6 ++++
 11 files changed, 90 insertions(+), 18 deletions(-)
 create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupVO.java

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelGroupMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelGroupMapper.java
index 6351cdcea..0c7881255 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelGroupMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLabelGroupMapper.java
@@ -25,6 +25,8 @@ public interface HyPartnerLabelGroupMapper {
 
     List<LabelGroupListVo> getLabelGroupList(HyPartnerLabelGroupDO record);
 
+    List<LabelGroupListVo> getLabelGroupListOrder(HyPartnerLabelGroupDO record);
+
     int updateByPrimaryKeySelective(HyPartnerLabelGroupDO record);
 
     int updateByPrimaryKey(HyPartnerLabelGroupDO record);
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml
index d7c523c4a..730ef3fed 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelGroupMapper.xml
@@ -223,4 +223,15 @@
     ORDER BY t1.create_time DESC
   </select>
 
+  <select id="getLabelGroupListOrder" resultType="com.cool.store.vo.LabelGroupListVo">
+    SELECT  t1.id, t1.label_group_name, t2.`name` AS editName, t2.mobile AS editMobile, t1.edit_date
+    FROM hy_partner_label_group t1
+    LEFT JOIN enterprise_user t2 ON t1.edit_user_id = t2.user_id
+    WHERE t1.deleted = 0
+    <if test="labelGroupName != null and labelGroupName != ''">
+      AND t1.label_group_name LIKE CONCAT('%', #{labelGroupName}, '%')
+    </if>
+    ORDER BY t1.create_time
+  </select>
+
 </mapper>
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml
index 58d599ae8..4fe9d227c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml
@@ -201,7 +201,7 @@
   </update>
 
   <select id="getLabelList" resultType="com.cool.store.vo.LabelListVo">
-    SELECT t1.id, t2.id AS labelGroupId, t1.label_name, t2.label_group_name, t3.`name` AS editName, t3.mobile AS editMobile, t1.edit_date
+    SELECT t1.id, t2.id AS labelGroupId, t1.label_name, t2.label_group_name, t3.`name` AS editName, t3.mobile AS editMobile, t1.edit_date,t1.create_time as labelCreateTime,t2.create_time AS groupCreateTime
       FROM hy_partner_label t1
       LEFT JOIN hy_partner_label_group t2 ON t1.label_group_id = t2.id
       LEFT JOIN enterprise_user t3 ON t1.edit_user_id = t3.user_id
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupVO.java
new file mode 100644
index 000000000..c741ab911
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelGroupVO.java
@@ -0,0 +1,29 @@
+package com.cool.store.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class LabelGroupVO {
+    @ApiModelProperty(value = "标签组ID")
+    private Long id;
+    @ApiModelProperty(value = "标签组名称")
+    private String labelGroupName;
+    @ApiModelProperty(value = "标签组创建时间")
+    private Date groupCreateTime;
+    @ApiModelProperty(value = "标签列表")
+    private List<LabelVO> labelList;
+    @Data
+    public static class LabelVO {
+        @ApiModelProperty(value = "标签ID")
+        private Long id;
+        @ApiModelProperty(value = "标签名称")
+        private String labelName;
+        @ApiModelProperty(value = "标签创建时间")
+        private Date labelCreateTime;
+    }
+}
+
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelListVo.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelListVo.java
index cbcdc795d..daabcdc7c 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelListVo.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LabelListVo.java
@@ -33,4 +33,10 @@ public class LabelListVo {
     @ApiModelProperty(value = "标签分组id")
     private Long labelGroupId;
 
+    @ApiModelProperty(value = "标签创建时间")
+    private Date labelCreateTime;
+
+    @ApiModelProperty(value = "标签组创建时间")
+    private Date groupCreateTime;
+
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java
index 5f5bf2aef..526c23b22 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LabelGroupService.java
@@ -53,4 +53,6 @@ public interface LabelGroupService {
 
     HyPartnerLabelGroupDO selectByPrimaryKey(Long id);
 
+    List<LabelGroupListVo> getLabelGroupListOrder();
+
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java
index 9c73e01cd..f9ad29afb 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LabelService.java
@@ -6,7 +6,7 @@ import com.cool.store.dto.label.LabelListDTO;
 import com.cool.store.dto.label.LabelUpdateDTO;
 import com.cool.store.entity.HyPartnerLabelDO;
 import com.cool.store.exception.ApiException;
-import com.cool.store.vo.LabelGroupListVo;
+import com.cool.store.vo.LabelGroupVO;
 import com.cool.store.vo.LabelListVo;
 
 import java.util.List;
@@ -62,5 +62,5 @@ public interface LabelService {
 
     void addEcLabel(HyPartnerLabelDO hyPartnerLabelDO);
 
-    List<LabelGroupListVo> getAllGroupAndLabelList();
+    List<LabelGroupVO> getAllGroupAndLabelList();
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java
index ebb8cef06..42f334876 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelGroupServiceImpl.java
@@ -5,7 +5,6 @@ import com.cool.store.dto.label.LabelGroupAddDTO;
 import com.cool.store.dto.label.LabelGroupDeleteDTO;
 import com.cool.store.dto.label.LabelGroupListDTO;
 import com.cool.store.dto.label.LabelGroupUpdateDTO;
-import com.cool.store.entity.HyPartnerLabelDO;
 import com.cool.store.entity.HyPartnerLabelGroupDO;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.exception.ApiException;
@@ -16,7 +15,6 @@ import com.cool.store.vo.LabelGroupListVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -127,6 +125,15 @@ public class LabelGroupServiceImpl implements LabelGroupService {
         labelGroupMapper.insertSelective(hyPartnerLabelGroupDO);
     }
 
+    /**
+     * 查询标签组信息列表正序
+     */
+    @Override
+    public List<LabelGroupListVo> getLabelGroupListOrder() {
+        HyPartnerLabelGroupDO labelGroupDO = new HyPartnerLabelGroupDO();
+        return labelGroupMapper.getLabelGroupListOrder(labelGroupDO);
+    }
+
     /**
      * 某个标签组内是否有未删除的标签
      * @param id 标签组 id
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java
index dc673833c..7808343d7 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LabelServiceImpl.java
@@ -10,7 +10,7 @@ import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.exception.ApiException;
 import com.cool.store.mapper.HyPartnerLabelMapper;
 import com.cool.store.service.LabelService;
-import com.cool.store.vo.LabelGroupListVo;
+import com.cool.store.vo.LabelGroupVO;
 import com.cool.store.vo.LabelListVo;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
@@ -118,20 +118,29 @@ public class LabelServiceImpl implements LabelService {
     }
 
     @Override
-    public List<LabelGroupListVo> getAllGroupAndLabelList() {
+    public List<LabelGroupVO> getAllGroupAndLabelList() {
         List<LabelListVo> labelList = labelMapper.getLabelList(new LabelListDTO());
         if (CollectionUtils.isEmpty(labelList)) {
             log.info("标签列表为空");
-            return Lists.newArrayList(new LabelGroupListVo());
+            return Lists.newArrayList(new LabelGroupVO());
         }
         Map<Long, List<LabelListVo>> idForVo = labelList.stream().collect(Collectors.groupingBy(LabelListVo::getLabelGroupId));
-        List<LabelGroupListVo> result = idForVo.entrySet().stream().map(entry -> {
-            LabelGroupListVo labelGroupListVo = new LabelGroupListVo();
-            labelGroupListVo.setId(entry.getKey());
-            labelGroupListVo.setLabelGroupName(entry.getValue().get(0).getLabelGroupName());
-            labelGroupListVo.setLabelList(entry.getValue());
-            return labelGroupListVo;
-        }).sorted(Comparator.comparing(LabelGroupListVo::getId)).collect(Collectors.toList());
+        List<LabelGroupVO> result = idForVo.entrySet().stream().map(entry -> {
+            LabelGroupVO vo = new LabelGroupVO();
+            vo.setId(entry.getKey());
+            vo.setLabelGroupName(entry.getValue().get(0).getLabelGroupName());
+            vo.setGroupCreateTime(entry.getValue().get(0).getGroupCreateTime());
+            List<LabelGroupVO.LabelVO> labelList1 = entry.getValue().stream().map(label -> {
+                LabelGroupVO.LabelVO labelVO = new LabelGroupVO.LabelVO();
+                labelVO.setId(label.getId());
+                labelVO.setLabelName(label.getLabelName());
+                labelVO.setLabelCreateTime(label.getLabelCreateTime());
+                return labelVO;
+            }).sorted(Comparator.comparing(LabelGroupVO.LabelVO::getLabelCreateTime))
+                    .collect(Collectors.toList());
+            vo.setLabelList(labelList1);
+            return vo;
+        }).sorted(Comparator.comparing(LabelGroupVO::getGroupCreateTime)).collect(Collectors.toList());
         return result;
     }
 
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java
index f6599cdaa..ae544dc9c 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelController.java
@@ -7,7 +7,7 @@ import com.cool.store.dto.label.LabelUpdateDTO;
 import com.cool.store.exception.ApiException;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.LabelService;
-import com.cool.store.vo.LabelGroupListVo;
+import com.cool.store.vo.LabelGroupVO;
 import com.cool.store.vo.LabelListVo;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -40,8 +40,8 @@ public class LabelController {
 
     @ApiOperation("查询标签组及子标签列表")
     @GetMapping("/labelGroupAndLabelList")
-    public ResponseResult<List<LabelGroupListVo>> getAllLabelList() {
-        List<LabelGroupListVo> result = labelService.getAllGroupAndLabelList();
+    public ResponseResult<List<LabelGroupVO>> getAllLabelList() {
+        List<LabelGroupVO> result = labelService.getAllGroupAndLabelList();
         return ResponseResult.success(result);
     }
 
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java
index da42a6da1..53b941c75 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LabelGroupController.java
@@ -65,5 +65,11 @@ public class LabelGroupController {
     public ResponseResult<List<LabelGroupListVo>> deleteLabelGroup() {
         return ResponseResult.success(labelGroupService.getAllLabelGroupList());
     }
+
+    @ApiOperation("获取所有标签组")
+    @PostMapping({"/allListAsc"})
+    public ResponseResult<List<LabelGroupListVo>> getLabelGroupListOrder() {
+        return ResponseResult.success(labelGroupService.getLabelGroupListOrder());
+    }
 }