From 6761c174cc49f9a7fd54f5898ca539f6e5d5272e Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Mon, 14 Jul 2025 13:56:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/CoscoPortalsLinksMapper.xml    | 39 ++++++++++++++-----
 .../portals/entity/CoscoPortalsLinks.java     |  2 +
 .../impl/CoscoPortalsAboutUsServiceImpl.java  | 21 ++++++----
 .../CoscoPortalsCustomerQandaServiceImpl.java | 25 +++++++-----
 .../CoscoPortalsDownloadsServiceImpl.java     | 30 ++++++++------
 ...oscoPortalsHelpcenterQandaServiceImpl.java | 19 ++++++---
 ...PortalsLinksClassificationServiceImpl.java | 16 +++++---
 .../impl/CoscoPortalsLinksServiceImpl.java    | 19 ++++++---
 .../impl/CoscoPortalsNoticeServiceImpl.java   | 23 +++++++----
 .../CoscoPortalsRegulationsServiceImpl.java   | 21 ++++++----
 10 files changed, 145 insertions(+), 70 deletions(-)

diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksMapper.xml
index ffe49f8..7f3e3d2 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/dao/mapper/CoscoPortalsLinksMapper.xml
@@ -20,6 +20,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="lastUpdateTime" column="last_update_time"/>
+        <result property="classificationName" column="classification_Name"/>
     </resultMap>
 
     <sql id="selectCoscoPortalsLinksVo">
@@ -45,32 +46,50 @@
     <select id="getPageList"
             parameterType="map"
             resultMap="CoscoPortalsLinksResult">
-        <include refid="selectCoscoPortalsLinksVo"/>
+        select
+        cpl.id,
+        cpl.classification_id,
+        cpl.name,
+        cpl.name_en,
+        cpl.thumbnail,
+        cpl.url,
+        cpl.status,
+        cpl.order_by,
+        cpl.remark,
+        cpl.del_flag,
+        cpl.create_by,
+        cpl.create_time,
+        cpl.update_by,
+        cpl.update_time,
+        cpl.last_update_time,
+        cplc.name as classification_Name
+        from cosco_portals_links cpl
+        left join cosco_portals_links_classification cplc on cpl.classification_id = cplc.id
         <where>
-            and del_flag = 'normal'
+            and cpl.del_flag = 'normal'
             <if test="vo.classificationId != null  and vo.classificationId != ''">
-                and classification_id = #{vo.classificationId}
+                and cpl.classification_id = #{vo.classificationId}
             </if>
             <if test="vo.name != null  and vo.name != ''">
-                and name like concat('%', #{vo.name}, '%')
+                and cpl.name like concat('%', #{vo.name}, '%')
             </if>
             <if test="vo.nameEn != null  and vo.nameEn != ''">
-                and name_en = #{vo.nameEn}
+                and cpl.name_en = #{vo.nameEn}
             </if>
             <if test="vo.thumbnail != null  and vo.thumbnail != ''">
-                and thumbnail = #{vo.thumbnail}
+                and cpl.thumbnail = #{vo.thumbnail}
             </if>
             <if test="vo.url != null  and vo.url != ''">
-                and url = #{vo.url}
+                and cpl.url = #{vo.url}
             </if>
             <if test="vo.status != null ">
-                and status = #{vo.status}
+                and cpl.status = #{vo.status}
             </if>
             <if test="vo.orderBy != null ">
-                and order_by = #{vo.orderBy}
+                and cpl.order_by = #{vo.orderBy}
             </if>
             <if test="vo.lastUpdateTime != null ">
-                and last_update_time = #{vo.lastUpdateTime}
+                and cpl.last_update_time = #{vo.lastUpdateTime}
             </if>
         </where>
     </select>
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/entity/CoscoPortalsLinks.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/entity/CoscoPortalsLinks.java
index b5efa7a..18d6ca9 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/entity/CoscoPortalsLinks.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/entity/CoscoPortalsLinks.java
@@ -39,6 +39,8 @@ public class CoscoPortalsLinks extends BaseEntity {
     /** 状态（0.启用、1.停用） */
     private Long status;
 
+    private String classificationName;
+
     /** 排序 */
     private Long orderBy;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsAboutUsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsAboutUsServiceImpl.java
index b0357d0..17f03c2 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsAboutUsServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsAboutUsServiceImpl.java
@@ -1,7 +1,10 @@
 package com.chinaunicom.zyhy.ebtp.supplier.portals.service.impl;
 
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsAboutUsMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsRegulationsMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.portals.entity.CoscoPortalsAboutUs;
@@ -55,20 +58,22 @@ public class CoscoPortalsAboutUsServiceImpl extends BaseServiceImpl<CoscoPortals
      */
     @Override
     public int insertCoscoPortalsAboutUs(CoscoPortalsAboutUs coscoPortalsAboutUs) {
+        Date date = new Date();
         List<CoscoPortalsAboutUs> coscoPortalsAboutUses = coscoPortalsAboutUsMapper.selectCoscoPortalsAboutUsList(new CoscoPortalsAboutUs());
-        if (coscoPortalsAboutUses.size() > 0) {
+        if (!coscoPortalsAboutUses.isEmpty()) {
             coscoPortalsAboutUs.setId(coscoPortalsAboutUses.get(0).getId());
         }
-        coscoPortalsAboutUs.setCreateTime(new Date());
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsAboutUs.setCreateTime(date);
         if(coscoPortalsAboutUs.getId()==null){
-            coscoPortalsAboutUs.setCreateTime(new Date());
+            coscoPortalsAboutUs.setCreateTime(date);
             coscoPortalsAboutUs.setId(PropertyUtils.getSnowflakeId());
-            coscoPortalsAboutUs.setUpdateTime(new Date());
-            coscoPortalsAboutUs.setCreateBy("admin");
+            coscoPortalsAboutUs.setUpdateTime(date);
+            coscoPortalsAboutUs.setCreateBy(currentUser.getUserId());
             return coscoPortalsAboutUsMapper.insertCoscoPortalsAboutUs(coscoPortalsAboutUs);
         }else{
-            coscoPortalsAboutUs.setUpdateTime(new Date());
-            coscoPortalsAboutUs.setUpdateBy("admin");
+            coscoPortalsAboutUs.setUpdateTime(date);
+            coscoPortalsAboutUs.setUpdateBy(currentUser.getUserId());
             return coscoPortalsAboutUsMapper.updateCoscoPortalsAboutUs(coscoPortalsAboutUs);
         }
     }
@@ -76,7 +81,7 @@ public class CoscoPortalsAboutUsServiceImpl extends BaseServiceImpl<CoscoPortals
     @Override
     public CoscoPortalsAboutUs selectNow() {
         List<CoscoPortalsAboutUs> coscoPortalsAboutUses = coscoPortalsAboutUsMapper.selectCoscoPortalsAboutUsList(new CoscoPortalsAboutUs());
-        if (coscoPortalsAboutUses.size() > 0) {
+        if (!coscoPortalsAboutUses.isEmpty()) {
             return coscoPortalsAboutUses.get(0);
         }else{
             return new CoscoPortalsAboutUs();
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsCustomerQandaServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsCustomerQandaServiceImpl.java
index 2075a32..47ba419 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsCustomerQandaServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsCustomerQandaServiceImpl.java
@@ -2,7 +2,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.portals.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CustomerQandaConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
@@ -57,11 +59,13 @@ public class CoscoPortalsCustomerQandaServiceImpl extends BaseServiceImpl<CoscoP
      */
     @Override
     public int insertCoscoPortalsCustomerQanda(CoscoPortalsCustomerQanda coscoPortalsCustomerQanda) {
-        coscoPortalsCustomerQanda.setCreateTime(new Date());
+        Date date = new Date();
+        coscoPortalsCustomerQanda.setCreateTime(date);
         coscoPortalsCustomerQanda.setId(PropertyUtils.getSnowflakeId());
-        coscoPortalsCustomerQanda.setUpdateTime(new Date());
-        coscoPortalsCustomerQanda.setAskTime(new Date());
-        coscoPortalsCustomerQanda.setCreateBy(UserConstant.USER_NAME);
+        coscoPortalsCustomerQanda.setUpdateTime(date);
+        coscoPortalsCustomerQanda.setAskTime(date);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsCustomerQanda.setCreateBy(currentUser.getUserId());
         return coscoPortalsCustomerQandaMapper.insertCoscoPortalsCustomerQanda(coscoPortalsCustomerQanda);
     }
 
@@ -73,12 +77,14 @@ public class CoscoPortalsCustomerQandaServiceImpl extends BaseServiceImpl<CoscoP
      */
     @Override
     public int updateCoscoPortalsCustomerQanda(CoscoPortalsCustomerQanda coscoPortalsCustomerQanda) {
-        coscoPortalsCustomerQanda.setUpdateTime(new Date());
-        coscoPortalsCustomerQanda.setUpdateBy(UserConstant.USER_NAME);
+        Date date = new Date();
+        coscoPortalsCustomerQanda.setUpdateTime(date);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsCustomerQanda.setUpdateBy(currentUser.getUserId());
         if(coscoPortalsCustomerQanda.getAnswerContent()!=null && coscoPortalsCustomerQanda.getAnswerContent().length()>0){
             coscoPortalsCustomerQanda.setIsAnswer(CustomerQandaConstant.REPLY.getStatus());
-            coscoPortalsCustomerQanda.setAnswerBy(UserConstant.USER_NAME);
-            coscoPortalsCustomerQanda.setAnswerTime(new Date());
+            coscoPortalsCustomerQanda.setAnswerBy(currentUser.getUserId());
+            coscoPortalsCustomerQanda.setAnswerTime(date);
         }
         return coscoPortalsCustomerQandaMapper.updateCoscoPortalsCustomerQanda(coscoPortalsCustomerQanda);
     }
@@ -114,12 +120,13 @@ public class CoscoPortalsCustomerQandaServiceImpl extends BaseServiceImpl<CoscoP
     @Override
     public int seeEdit(String id) {
         CoscoPortalsCustomerQanda coscoPortalsCustomerQanda = coscoPortalsCustomerQandaMapper.selectCoscoPortalsCustomerQandaById(id);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
         if (coscoPortalsCustomerQanda.getIsAnswer().equals(CustomerQandaConstant.WAIT_REPLY.getStatus())) {
             CoscoPortalsCustomerQanda qanda = new CoscoPortalsCustomerQanda();
             qanda.setId(id);
             qanda.setIsAnswer(CustomerQandaConstant.VIEW.getStatus());
             qanda.setUpdateTime(new Date());
-            qanda.setUpdateBy(UserConstant.USER_NAME);
+            qanda.setUpdateBy(currentUser.getUserId());
             return coscoPortalsCustomerQandaMapper.updateCoscoPortalsCustomerQanda(qanda);
         }
         return 0;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsDownloadsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsDownloadsServiceImpl.java
index 50ec1cd..cb09528 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsDownloadsServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsDownloadsServiceImpl.java
@@ -6,7 +6,11 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
+import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.PublicStatus;
 import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsCustomerQandaMapper;
@@ -68,12 +72,14 @@ public class CoscoPortalsDownloadsServiceImpl  extends BaseServiceImpl<CoscoPort
      */
     @Override
     public int insertCoscoPortalsDownloads(CoscoPortalsDownloads coscoPortalsDownloads) {
-        coscoPortalsDownloads.setId(CoscoIdUtil.getId());
-        coscoPortalsDownloads.setCreateTime(CoscoDateUtils.getNowDate());
-        coscoPortalsDownloads.setCreateBy("1");
-        coscoPortalsDownloads.setUpdateBy("1");
-        coscoPortalsDownloads.setUpdateTime(CoscoDateUtils.getNowDate());
-        coscoPortalsDownloads.setLastUpdateTime(CoscoDateUtils.getNowDate());
+        Date date = new Date();
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsDownloads.setId(PropertyUtils.getSnowflakeId());
+        coscoPortalsDownloads.setCreateTime(date);
+        coscoPortalsDownloads.setCreateBy(currentUser.getUserId());
+        coscoPortalsDownloads.setUpdateBy(currentUser.getUserId());
+        coscoPortalsDownloads.setUpdateTime(date);
+        coscoPortalsDownloads.setLastUpdateTime(date);
         return coscoPortalsDownloadsMapper.insertCoscoPortalsDownloads(coscoPortalsDownloads);
     }
 
@@ -85,15 +91,17 @@ public class CoscoPortalsDownloadsServiceImpl  extends BaseServiceImpl<CoscoPort
      */
     @Override
     public int updateCoscoPortalsDownloads(CoscoPortalsDownloads coscoPortalsDownloads) {
+        Date date = new Date();
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
         if(coscoPortalsDownloads.getStatus() != null){
             if(PublicStatus.STATUS_SJ == coscoPortalsDownloads.getStatus()){//上架
-                coscoPortalsDownloads.setPublishBy("1");
-                coscoPortalsDownloads.setPublishTime(CoscoDateUtils.getNowDate());
+                coscoPortalsDownloads.setPublishBy(currentUser.getUserId());
+                coscoPortalsDownloads.setPublishTime(date);
             }
         }
-        coscoPortalsDownloads.setUpdateBy("1");
-        coscoPortalsDownloads.setUpdateTime(CoscoDateUtils.getNowDate());
-        coscoPortalsDownloads.setLastUpdateTime(CoscoDateUtils.getNowDate());
+        coscoPortalsDownloads.setUpdateBy(currentUser.getUserId());
+        coscoPortalsDownloads.setUpdateTime(date);
+        coscoPortalsDownloads.setLastUpdateTime(date);
         return coscoPortalsDownloadsMapper.updateCoscoPortalsDownloads(coscoPortalsDownloads);
     }
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsHelpcenterQandaServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsHelpcenterQandaServiceImpl.java
index ef32cb2..da3652c 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsHelpcenterQandaServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsHelpcenterQandaServiceImpl.java
@@ -2,7 +2,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.portals.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UpConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
@@ -56,10 +58,12 @@ public class CoscoPortalsHelpcenterQandaServiceImpl extends BaseServiceImpl<Cosc
      */
     @Override
     public int insertCoscoPortalsHelpcenterQanda(CoscoPortalsHelpcenterQanda coscoPortalsHelpcenterQanda) {
-        coscoPortalsHelpcenterQanda.setCreateTime(new Date());
+        Date date = new Date();
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsHelpcenterQanda.setCreateTime(date);
         coscoPortalsHelpcenterQanda.setId(PropertyUtils.getSnowflakeId());
-        coscoPortalsHelpcenterQanda.setUpdateTime(new Date());
-        coscoPortalsHelpcenterQanda.setCreateBy(UserConstant.USER_NAME);
+        coscoPortalsHelpcenterQanda.setUpdateTime(date);
+        coscoPortalsHelpcenterQanda.setCreateBy(currentUser.getUserId());
         coscoPortalsHelpcenterQanda.setStatus(UpConstant.DRAFT);
         return coscoPortalsHelpcenterQandaMapper.insertCoscoPortalsHelpcenterQanda(coscoPortalsHelpcenterQanda);
     }
@@ -73,7 +77,8 @@ public class CoscoPortalsHelpcenterQandaServiceImpl extends BaseServiceImpl<Cosc
     @Override
     public int updateCoscoPortalsHelpcenterQanda(CoscoPortalsHelpcenterQanda coscoPortalsHelpcenterQanda) {
         coscoPortalsHelpcenterQanda.setUpdateTime(new Date());
-        coscoPortalsHelpcenterQanda.setUpdateBy(UserConstant.USER_NAME);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsHelpcenterQanda.setUpdateBy(currentUser.getUserId());
         return coscoPortalsHelpcenterQandaMapper.updateCoscoPortalsHelpcenterQanda(coscoPortalsHelpcenterQanda);
     }
 
@@ -117,7 +122,8 @@ public class CoscoPortalsHelpcenterQandaServiceImpl extends BaseServiceImpl<Cosc
         qanda.setId(id);
         qanda.setStatus(UpConstant.UP);
         qanda.setUpdateTime(new Date());
-        qanda.setUpdateBy(UserConstant.USER_NAME);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        qanda.setUpdateBy(currentUser.getUserId());
         return coscoPortalsHelpcenterQandaMapper.updateCoscoPortalsHelpcenterQanda(qanda);
     }
 
@@ -127,7 +133,8 @@ public class CoscoPortalsHelpcenterQandaServiceImpl extends BaseServiceImpl<Cosc
         qanda.setId(id);
         qanda.setStatus(UpConstant.DOWN);
         qanda.setUpdateTime(new Date());
-        qanda.setUpdateBy(UserConstant.USER_NAME);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        qanda.setUpdateBy(currentUser.getUserId());
         return coscoPortalsHelpcenterQandaMapper.updateCoscoPortalsHelpcenterQanda(qanda);
     }
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksClassificationServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksClassificationServiceImpl.java
index a9ef369..43aa5e0 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksClassificationServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksClassificationServiceImpl.java
@@ -7,9 +7,12 @@ import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UpConstant;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.base.vo.LinksClassificationVo;
 import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
 import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsKeywordsMapper;
@@ -66,10 +69,12 @@ public class CoscoPortalsLinksClassificationServiceImpl extends BaseServiceImpl<
      */
     @Override
     public int insertCoscoPortalsLinksClassification(CoscoPortalsLinksClassification coscoPortalsLinksClassification) {
-        coscoPortalsLinksClassification.setCreateTime(new Date());
+        Date date = new Date();
+        coscoPortalsLinksClassification.setCreateTime(date);
         coscoPortalsLinksClassification.setId(PropertyUtils.getSnowflakeId());
-        coscoPortalsLinksClassification.setUpdateTime(new Date());
-        coscoPortalsLinksClassification.setCreateBy("admin");
+        coscoPortalsLinksClassification.setUpdateTime(date);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsLinksClassification.setCreateBy(currentUser.getUserId());
         return coscoPortalsLinksClassificationMapper.insertCoscoPortalsLinksClassification(coscoPortalsLinksClassification);
     }
 
@@ -82,7 +87,8 @@ public class CoscoPortalsLinksClassificationServiceImpl extends BaseServiceImpl<
     @Override
     public int updateCoscoPortalsLinksClassification(CoscoPortalsLinksClassification coscoPortalsLinksClassification) {
         coscoPortalsLinksClassification.setUpdateTime(new Date());
-        coscoPortalsLinksClassification.setUpdateBy("admin");
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsLinksClassification.setUpdateBy(currentUser.getUserId());
         return coscoPortalsLinksClassificationMapper.updateCoscoPortalsLinksClassification(coscoPortalsLinksClassification);
     }
 
@@ -108,7 +114,7 @@ public class CoscoPortalsLinksClassificationServiceImpl extends BaseServiceImpl<
         CoscoPortalsLinks coscoPortalsLinks = new CoscoPortalsLinks();
         coscoPortalsLinks.setClassificationId(id);
         List<CoscoPortalsLinks> coscoPortalsLinks1 = coscoPortalsLinkService.selectCoscoPortalsLinksList(coscoPortalsLinks);
-        if (coscoPortalsLinks1.size() > 0) {
+        if (!coscoPortalsLinks1.isEmpty()) {
             throw new RuntimeException("请先删除该分类下的友情链接");
         }
         return coscoPortalsLinksClassificationMapper.deleteCoscoPortalsLinksClassificationById(id);
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksServiceImpl.java
index 64c3ee7..85b116a 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsLinksServiceImpl.java
@@ -2,7 +2,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.portals.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UpConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
@@ -56,10 +58,12 @@ public class CoscoPortalsLinksServiceImpl extends BaseServiceImpl<CoscoPortalsLi
      */
     @Override
     public int insertCoscoPortalsLinks(CoscoPortalsLinks coscoPortalsLinks) {
-        coscoPortalsLinks.setCreateTime(new Date());
+        Date date = new Date();
+        coscoPortalsLinks.setCreateTime(date);
         coscoPortalsLinks.setId(PropertyUtils.getSnowflakeId());
-        coscoPortalsLinks.setUpdateTime(new Date());
-        coscoPortalsLinks.setCreateBy(UserConstant.USER_NAME);
+        coscoPortalsLinks.setUpdateTime(date);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsLinks.setCreateBy(currentUser.getUserId());
         coscoPortalsLinks.setStatus(UpConstant.DISABLE);
         return coscoPortalsLinksMapper.insertCoscoPortalsLinks(coscoPortalsLinks);
     }
@@ -73,7 +77,8 @@ public class CoscoPortalsLinksServiceImpl extends BaseServiceImpl<CoscoPortalsLi
     @Override
     public int updateCoscoPortalsLinks(CoscoPortalsLinks coscoPortalsLinks) {
         coscoPortalsLinks.setUpdateTime(new Date());
-        coscoPortalsLinks.setUpdateBy(UserConstant.USER_NAME);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsLinks.setUpdateBy(currentUser.getUserId());
         return coscoPortalsLinksMapper.updateCoscoPortalsLinks(coscoPortalsLinks);
     }
 
@@ -116,7 +121,8 @@ public class CoscoPortalsLinksServiceImpl extends BaseServiceImpl<CoscoPortalsLi
         CoscoPortalsLinks coscoPortalsLinks=new CoscoPortalsLinks();
         coscoPortalsLinks.setId(id);
         coscoPortalsLinks.setUpdateTime(new Date());
-        coscoPortalsLinks.setUpdateBy(UserConstant.USER_NAME);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsLinks.setUpdateBy(currentUser.getUserId());
         coscoPortalsLinks.setStatus(UpConstant.ENABLE);
         return coscoPortalsLinksMapper.updateCoscoPortalsLinks(coscoPortalsLinks);
     }
@@ -132,7 +138,8 @@ public class CoscoPortalsLinksServiceImpl extends BaseServiceImpl<CoscoPortalsLi
         coscoPortalsLinks.setId(id);
         coscoPortalsLinks.setStatus(UpConstant.DISABLE);
         coscoPortalsLinks.setUpdateTime(new Date());
-        coscoPortalsLinks.setUpdateBy(UserConstant.USER_NAME);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsLinks.setUpdateBy(currentUser.getUserId());
         return coscoPortalsLinksMapper.updateCoscoPortalsLinks(coscoPortalsLinks);
     }
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsNoticeServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsNoticeServiceImpl.java
index d3897c7..bccc3e9 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsNoticeServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsNoticeServiceImpl.java
@@ -5,7 +5,11 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
+import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.common.PublicStatus;
 import com.chinaunicom.zyhy.ebtp.supplier.portals.dao.CoscoPortalsLinksMapper;
@@ -67,12 +71,14 @@ public class CoscoPortalsNoticeServiceImpl extends BaseServiceImpl<CoscoPortalsN
      */
     @Override
     public int insertCoscoPortalsNotice(CoscoPortalsNotice coscoPortalsNotice) {
-        coscoPortalsNotice.setId(CoscoIdUtil.getId());
-        coscoPortalsNotice.setCreateTime(CoscoDateUtils.getNowDate());
-        coscoPortalsNotice.setCreateBy("1");
-        coscoPortalsNotice.setUpdateBy("1");
-        coscoPortalsNotice.setUpdateTime(CoscoDateUtils.getNowDate());
-        coscoPortalsNotice.setLastUpdateTime(CoscoDateUtils.getNowDate());
+        Date date = new Date();
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsNotice.setId(PropertyUtils.getSnowflakeId());
+        coscoPortalsNotice.setCreateTime(date);
+        coscoPortalsNotice.setCreateBy(currentUser.getUserId());
+        coscoPortalsNotice.setUpdateBy(currentUser.getUserId());
+        coscoPortalsNotice.setUpdateTime(date);
+        coscoPortalsNotice.setLastUpdateTime(date);
         return coscoPortalsNoticeMapper.insertCoscoPortalsNotice(coscoPortalsNotice);
     }
 
@@ -84,13 +90,14 @@ public class CoscoPortalsNoticeServiceImpl extends BaseServiceImpl<CoscoPortalsN
      */
     @Override
     public int updateCoscoPortalsNotice(CoscoPortalsNotice coscoPortalsNotice) {
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
         if(coscoPortalsNotice.getStatus() != null){
             if(PublicStatus.STATUS_SJ == coscoPortalsNotice.getStatus()){//上架
-                coscoPortalsNotice.setPublishBy("1");
+                coscoPortalsNotice.setPublishBy(currentUser.getUserId());
                 coscoPortalsNotice.setPublishTime(CoscoDateUtils.getNowDate());
             }
         }
-        coscoPortalsNotice.setUpdateBy("1");
+        coscoPortalsNotice.setUpdateBy(currentUser.getUserId());
         coscoPortalsNotice.setUpdateTime(CoscoDateUtils.getNowDate());
         coscoPortalsNotice.setLastUpdateTime(CoscoDateUtils.getNowDate());
         return coscoPortalsNoticeMapper.updateCoscoPortalsNotice(coscoPortalsNotice);
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsRegulationsServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsRegulationsServiceImpl.java
index ff8eeda..d3bcac9 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsRegulationsServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/portals/service/impl/CoscoPortalsRegulationsServiceImpl.java
@@ -2,7 +2,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.portals.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UpConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.UserConstant;
@@ -56,10 +58,12 @@ public class CoscoPortalsRegulationsServiceImpl extends BaseServiceImpl<CoscoPor
      */
     @Override
     public int insertCoscoPortalsRegulations(CoscoPortalsRegulations coscoPortalsRegulations) {
-        coscoPortalsRegulations.setCreateTime(new Date());
+        Date date=new Date();
+        coscoPortalsRegulations.setCreateTime(date);
         coscoPortalsRegulations.setId(PropertyUtils.getSnowflakeId());
-        coscoPortalsRegulations.setUpdateTime(new Date());
-        coscoPortalsRegulations.setCreateBy(UserConstant.USER_NAME);
+        coscoPortalsRegulations.setUpdateTime(date);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsRegulations.setCreateBy(currentUser.getUserId());
         return coscoPortalsRegulationsMapper.insertCoscoPortalsRegulations(coscoPortalsRegulations);
     }
 
@@ -72,7 +76,8 @@ public class CoscoPortalsRegulationsServiceImpl extends BaseServiceImpl<CoscoPor
     @Override
     public int updateCoscoPortalsRegulations(CoscoPortalsRegulations coscoPortalsRegulations) {
         coscoPortalsRegulations.setUpdateTime(new Date());
-        coscoPortalsRegulations.setUpdateBy(UserConstant.USER_NAME);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsRegulations.setUpdateBy(currentUser.getUserId());
         return coscoPortalsRegulationsMapper.updateCoscoPortalsRegulations(coscoPortalsRegulations);
     }
 
@@ -120,9 +125,10 @@ public class CoscoPortalsRegulationsServiceImpl extends BaseServiceImpl<CoscoPor
         CoscoPortalsRegulations coscoPortalsRegulations = new CoscoPortalsRegulations();
         coscoPortalsRegulations.setId(id);
         coscoPortalsRegulations.setStatus(UpConstant.UP);
-        coscoPortalsRegulations.setPublishBy(UserConstant.USER_NAME);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        coscoPortalsRegulations.setPublishBy(currentUser.getUserId());
         coscoPortalsRegulations.setUpdateTime(new Date());
-        coscoPortalsRegulations.setUpdateBy(UserConstant.USER_NAME);
+        coscoPortalsRegulations.setUpdateBy(currentUser.getUserId());
         return coscoPortalsRegulationsMapper.updateCoscoPortalsRegulations(coscoPortalsRegulations);
     }
 
@@ -130,9 +136,10 @@ public class CoscoPortalsRegulationsServiceImpl extends BaseServiceImpl<CoscoPor
     public int down(String id) {
         CoscoPortalsRegulations coscoPortalsRegulations = new CoscoPortalsRegulations();
         coscoPortalsRegulations.setId(id);
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
         coscoPortalsRegulations.setStatus(UpConstant.DOWN);
         coscoPortalsRegulations.setUpdateTime(new Date());
-        coscoPortalsRegulations.setUpdateBy(UserConstant.USER_NAME);
+        coscoPortalsRegulations.setUpdateBy(currentUser.getUserId());
         return coscoPortalsRegulationsMapper.updateCoscoPortalsRegulations(coscoPortalsRegulations);
     }