From 777e9a88275c9315928b49f99592932eba48a732 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Wed, 13 Dec 2023 16:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E5=AE=A2=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/WxSystemSetting.java    | 11 +++++++++++
 .../flossom/hzMapper/Enums/SystemSettingKeyEnum.java  |  3 ++-
 .../mapper/hzMapper/WxSystemSettingMapper.xml         |  6 +++++-
 .../controller/SysFiringInfoController.java           | 10 ----------
 .../controller/SystemSettingController.java           | 11 +++++++++++
 .../miniProgram/service/ISysFiringInfoService.java    |  2 --
 .../miniProgram/service/ISystemSettingService.java    |  3 +++
 .../service/impl/SysFiringInfoServiceImpl.java        |  8 --------
 .../service/impl/SystemSettingServiceImpl.java        | 10 ++++++++++
 9 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxSystemSetting.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxSystemSetting.java
index bcbbb4a..83dea0d 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxSystemSetting.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxSystemSetting.java
@@ -37,6 +37,8 @@ public class WxSystemSetting extends BaseEntity {
     @Excel(name = "说明")
     private String instructions;
 
+    private String pictureUrl;
+
     /**
      * 状态（0正常 1停用）
      */
@@ -83,6 +85,14 @@ public class WxSystemSetting extends BaseEntity {
         return status;
     }
 
+    public String getPictureUrl() {
+        return pictureUrl;
+    }
+
+    public void setPictureUrl(String pictureUrl) {
+        this.pictureUrl = pictureUrl;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -91,6 +101,7 @@ public class WxSystemSetting extends BaseEntity {
                 .append("value", getValue())
                 .append("instructions", getInstructions())
                 .append("status", getStatus())
+                .append("pictureUrl", getPictureUrl())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums/SystemSettingKeyEnum.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums/SystemSettingKeyEnum.java
index 7f12f79..116e366 100644
--- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums/SystemSettingKeyEnum.java
+++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/Enums/SystemSettingKeyEnum.java
@@ -9,7 +9,8 @@ public enum SystemSettingKeyEnum {
     INTEGRAL_RULE("INTEGRAL_RULE", "积分规则"),
     ABOUT_US("ABOUT_US", "关于我们"),
     BLUETOOTH_GUIDANCE_PERMISSIONS("BLUETOOTH_GUIDANCE_PERMISSIONS", "蓝牙指引权限"),
-    LOCATION_GUIDANCE_PERMISSIONS("LOCATION_GUIDANCE_PERMISSIONS", "定位指引权限");
+    LOCATION_GUIDANCE_PERMISSIONS("LOCATION_GUIDANCE_PERMISSIONS", "定位指引权限"),
+    CONTACT_WORKER("CONTACT_WORKER", "联系客服");
 
     private final String key;
     private final String remark;
diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxSystemSettingMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxSystemSettingMapper.xml
index 18fa5a8..20454f9 100644
--- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxSystemSettingMapper.xml
+++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxSystemSettingMapper.xml
@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="key"    column="key"    />
         <result property="value"    column="value"    />
         <result property="instructions"    column="instructions"    />
+        <result property="pictureUrl"    column="picture_url"    />
         <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -18,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxSystemSettingVo">
-        select id, `key`, `value`, instructions, status, create_by, create_time, update_by, update_time, remark from wx_system_setting
+        select id, `key`, `value`, instructions, picture_url, status, create_by, create_time, update_by, update_time, remark from wx_system_setting
     </sql>
 
     <select id="selectWxSystemSettingList" parameterType="WxSystemSetting" resultMap="WxSystemSettingResult">
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="key != null">key,</if>
             <if test="value != null">value,</if>
             <if test="instructions != null">instructions,</if>
+            <if test="pictureUrl != null">picture_url,</if>
             <if test="status != null">status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -53,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="key != null">#{key},</if>
             <if test="value != null">#{value},</if>
             <if test="instructions != null">#{instructions},</if>
+            <if test="pictureUrl != null">#{pictureUrl},</if>
             <if test="status != null">#{status},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -68,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="key != null">key = #{key},</if>
             <if test="value != null">value = #{value},</if>
             <if test="instructions != null">instructions = #{instructions},</if>
+            <if test="pictureUrl != null">picture_url = #{pictureUrl},</if>
             <if test="status != null">status = #{status},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/SysFiringInfoController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/SysFiringInfoController.java
index fddb156..06b274e 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/SysFiringInfoController.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/SysFiringInfoController.java
@@ -23,16 +23,6 @@ public class SysFiringInfoController extends BaseController {
     @Autowired
     private ISysFiringInfoService sysFiringInfoService;
 
-    /**
-     * 联系客服
-     *
-     * @return
-     */
-    @GetMapping("/contactWorker")
-    public AjaxResult contactWorker() {
-        return AjaxResult.success(sysFiringInfoService.contactWorker());
-    }
-
     /**
      * 查询登录信息列表
      */
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/SystemSettingController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/SystemSettingController.java
index b78eb4e..55a5426 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/SystemSettingController.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/SystemSettingController.java
@@ -79,4 +79,15 @@ public class SystemSettingController extends BaseController {
         return AjaxResult.success(systemSettingService.getLocationGuidance());
     }
 
+
+    /**
+     * 获取 联系客服
+     *
+     * @return
+     */
+    @GetMapping("/getContactWorker")
+    public AjaxResult getContactWorker() {
+        return AjaxResult.success(systemSettingService.getContactWorker());
+    }
+
 }
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISysFiringInfoService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISysFiringInfoService.java
index 317ce3b..59b012a 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISysFiringInfoService.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISysFiringInfoService.java
@@ -6,8 +6,6 @@ import java.util.List;
 
 public interface ISysFiringInfoService {
 
-    SysFiringInfo contactWorker();
-
     /**
      * 查询登录信息列表
      *
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISystemSettingService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISystemSettingService.java
index 1584714..0f52bad 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISystemSettingService.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISystemSettingService.java
@@ -16,4 +16,7 @@ public interface ISystemSettingService {
     WxSystemSetting getBluetoothGuidance();
 
     WxSystemSetting getLocationGuidance();
+
+    WxSystemSetting getContactWorker();
+
 }
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysFiringInfoServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysFiringInfoServiceImpl.java
index 44d05bc..a93dca5 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysFiringInfoServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysFiringInfoServiceImpl.java
@@ -14,14 +14,6 @@ public class SysFiringInfoServiceImpl implements ISysFiringInfoService {
     @Autowired
     private SysFiringInfoMapper sysFiringInfoMapper;
 
-    @Override
-    public SysFiringInfo contactWorker() {
-        SysFiringInfo sysFiringInfo = new SysFiringInfo();
-        sysFiringInfo.setType("3");
-        List<SysFiringInfo> sysFiringInfos = sysFiringInfoMapper.selectSysFiringInfoList(sysFiringInfo);
-        return sysFiringInfos.get(0);
-    }
-
     /**
      * 查询登录信息列表
      *
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SystemSettingServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SystemSettingServiceImpl.java
index 112010e..7c6bbb6 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SystemSettingServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SystemSettingServiceImpl.java
@@ -73,4 +73,14 @@ public class SystemSettingServiceImpl implements ISystemSettingService {
     public WxSystemSetting getLocationGuidance() {
         return systemSettingMapper.getSystemSettingByKey(SystemSettingKeyEnum.LOCATION_GUIDANCE_PERMISSIONS.getKey());
     }
+
+    /**
+     * 获取联系客服
+     *
+     * @return
+     */
+    @Override
+    public WxSystemSetting getContactWorker() {
+        return systemSettingMapper.getSystemSettingByKey(SystemSettingKeyEnum.CONTACT_WORKER.getKey());
+    }
 }