From 4bfaee2ba69787ef06b6649bc55bf92a5bb068ab Mon Sep 17 00:00:00 2001
From: ymnets <ymnets@qq.com>
Date: Thu, 21 Nov 2024 14:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.idea/easyCodeTableSetting.xml            | 114 ++++++++++++++++
 JAVA_MYSQL_WEBSITE/.idea/uiDesigner.xml       | 124 ++++++++++++++++++
 JAVA_MYSQL_WEBSITE/.idea/workspace.xml        |  13 +-
 .../hc/gpbusiness/mapper/WebQrCodeMapper.java |  26 ++++
 .../com/hc/gpbusiness/model/WebQrCode.java    |  60 +++++++++
 .../gpbusiness/service/WebQrCodeService.java  |  64 +++++++++
 .../service/impl/WebQrCodeServiceImpl.java    |  94 +++++++++++++
 .../main/resources/mapper/WebNewsMapper.xml   |   2 +
 .../main/resources/mapper/WebQrCodeMapper.xml |  54 ++++++++
 .../front/FrontQrCodeController.java          |  44 +++++++
 .../src/main/resources/application-dev.yml    |   4 +-
 11 files changed, 596 insertions(+), 3 deletions(-)
 create mode 100644 JAVA_MYSQL_WEBSITE/.idea/easyCodeTableSetting.xml
 create mode 100644 JAVA_MYSQL_WEBSITE/.idea/uiDesigner.xml
 create mode 100644 JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/mapper/WebQrCodeMapper.java
 create mode 100644 JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebQrCode.java
 create mode 100644 JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/WebQrCodeService.java
 create mode 100644 JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebQrCodeServiceImpl.java
 create mode 100644 JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebQrCodeMapper.xml
 create mode 100644 JAVA_MYSQL_WEBSITE/gp-web/src/main/java/com/hc/gpweb/controller/front/FrontQrCodeController.java

diff --git a/JAVA_MYSQL_WEBSITE/.idea/easyCodeTableSetting.xml b/JAVA_MYSQL_WEBSITE/.idea/easyCodeTableSetting.xml
new file mode 100644
index 0000000..3e39e1c
--- /dev/null
+++ b/JAVA_MYSQL_WEBSITE/.idea/easyCodeTableSetting.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EasyCodeTableSetting">
+    <option name="tableInfoMap">
+      <map>
+        <entry key="gp_union.web_news_attachment">
+          <value>
+            <TableInfoDTO>
+              <option name="comment" value="新闻附件表" />
+              <option name="fullColumn">
+                <list>
+                  <ColumnInfoDTO>
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="attachmentId" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="新闻ID" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="newsId" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="附件地址" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="attachmentUrl" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                </list>
+              </option>
+              <option name="name" value="WebNewsAttachment" />
+              <option name="preName" value="" />
+              <option name="saveModelName" value="" />
+              <option name="savePackageName" value="" />
+              <option name="savePath" value="" />
+              <option name="templateGroupName" value="" />
+            </TableInfoDTO>
+          </value>
+        </entry>
+        <entry key="gp_union.web_qr_code">
+          <value>
+            <TableInfoDTO>
+              <option name="comment" value="官网二维码表" />
+              <option name="fullColumn">
+                <list>
+                  <ColumnInfoDTO>
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="qrId" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="qrName1" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="qrName2" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="12表示文件 视频" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="qrType" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="qrId1" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="qrId2" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="文件名" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="fileName" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="文件地址" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="fileUrl" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                </list>
+              </option>
+              <option name="name" value="WebQrCode" />
+              <option name="preName" value="" />
+              <option name="saveModelName" value="gp-web" />
+              <option name="savePackageName" value="com.hc.gpweb" />
+              <option name="savePath" value="./gp-web/src/main/java/com/hc/gpweb" />
+              <option name="templateGroupName" value="Code-Jia" />
+            </TableInfoDTO>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/JAVA_MYSQL_WEBSITE/.idea/uiDesigner.xml b/JAVA_MYSQL_WEBSITE/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/JAVA_MYSQL_WEBSITE/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/JAVA_MYSQL_WEBSITE/.idea/workspace.xml b/JAVA_MYSQL_WEBSITE/.idea/workspace.xml
index 8bce958..c641e75 100644
--- a/JAVA_MYSQL_WEBSITE/.idea/workspace.xml
+++ b/JAVA_MYSQL_WEBSITE/.idea/workspace.xml
@@ -5,8 +5,18 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ef55dc1b-11d9-4203-81db-14a06469a368" name="更改" comment="">
-      <change beforePath="$PROJECT_DIR$/../JAVA_MYSQL_HCJXJY/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../JAVA_MYSQL_HCJXJY/pom.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/easyCodeTableSetting.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/mapper/WebQrCodeMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/model/WebQrCode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/WebQrCodeService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebQrCodeServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebQrCodeMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/gp-web/src/main/java/com/hc/gpweb/controller/front/FrontQrCodeController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebNewsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/gp-business/src/main/resources/mapper/WebNewsMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gp-web/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/gp-web/src/main/resources/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gp-web/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/gp-web/src/main/resources/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -107,6 +117,7 @@
       <workItem from="1731396372121" duration="90000" />
       <workItem from="1731396540755" duration="630000" />
       <workItem from="1731404423787" duration="15000" />
+      <workItem from="1732161369130" duration="3297000" />
     </task>
     <task id="LOCAL-00001" summary="更改表名字">
       <created>1730470371982</created>
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/mapper/WebQrCodeMapper.java b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/mapper/WebQrCodeMapper.java
new file mode 100644
index 0000000..22cab06
--- /dev/null
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/mapper/WebQrCodeMapper.java
@@ -0,0 +1,26 @@
+package com.hc.gpbusiness.mapper;
+
+import com.hc.gpbusiness.model.WebNewsType;
+import com.hc.gpbusiness.model.WebQrCode;
+import com.hc.gpcore.utils.tk.mapper.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+/**
+ * 官网二维码表(WebQrCode)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-21 14:29:03
+ */
+
+@Repository
+public interface WebQrCodeMapper extends Mapper<WebQrCode> {
+
+    List<WebQrCode> queryByAll(String qrName1,
+                               String qrName2,
+                               Integer qrType,
+                               Integer qrId1,
+                               Integer qrId2,String fileName);
+}
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebQrCode.java b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebQrCode.java
new file mode 100644
index 0000000..13a92b4
--- /dev/null
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/model/WebQrCode.java
@@ -0,0 +1,60 @@
+package com.hc.gpbusiness.model;
+
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+
+@Data
+@ApiModel(value = "二维码表")
+public class WebQrCode implements Serializable {
+
+    private static final long serialVersionUID = 294862655971334716L;
+
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value = "主键id")
+    private Integer qrId;
+
+
+    @ApiModelProperty(value = "qrName1")
+    private String qrName1;
+
+
+    @ApiModelProperty(value = "qrName2")
+    private String qrName2;
+
+    /**
+     * 12表示文件 视频
+     */
+    @ApiModelProperty(value = "12表示文件 视频")
+    private Integer qrType;
+
+
+    @ApiModelProperty(value = "qrId1")
+    private Integer qrId1;
+
+
+    @ApiModelProperty(value = "qrId2")
+    private Integer qrId2;
+
+    /**
+     * 文件名
+     */
+    @ApiModelProperty(value = "文件名")
+    private String fileName;
+
+    /**
+     * 文件地址
+     */
+    @ApiModelProperty(value = "文件地址")
+    private String fileUrl;
+}
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/WebQrCodeService.java b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/WebQrCodeService.java
new file mode 100644
index 0000000..886b07a
--- /dev/null
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/WebQrCodeService.java
@@ -0,0 +1,64 @@
+package com.hc.gpbusiness.service;
+
+import com.github.pagehelper.PageInfo;
+import com.hc.gpbusiness.model.WebQrCode;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 官网二维码表(WebQrCode)表服务接口
+ *
+ * @author makejava
+ * @since 2024-11-21 14:29:52
+ */
+
+@Component
+public interface WebQrCodeService {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param qrId 主键
+     * @return 实例对象
+     */
+    WebQrCode queryById(Integer qrId);
+
+    /**
+     * 新增数据
+     *
+     * @param webQrCode 实例对象
+     * @return 实例对象
+     */
+    WebQrCode insert(WebQrCode webQrCode);
+
+    /**
+     * 修改数据
+     *
+     * @param webQrCode 实例对象
+     * @return 实例对象
+     */
+    WebQrCode update(WebQrCode webQrCode);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param qrId 主键
+     * @return 是否成功
+     */
+    boolean deleteById(Integer qrId);
+
+    /**
+     * 分页查询多条数据
+     *
+     * @param page 页码
+     * @param size 查询条数
+     * @return 对象列表
+     */
+    PageInfo queryAllByLimit(int page, int size);
+
+    PageInfo queryByAll(int page, int size,String qrName1,
+                        String qrName2,
+                        Integer qrType,
+                        Integer qrId1,
+                        Integer qrId2,String fileName);
+}
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebQrCodeServiceImpl.java b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebQrCodeServiceImpl.java
new file mode 100644
index 0000000..6b17c15
--- /dev/null
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/java/com/hc/gpbusiness/service/impl/WebQrCodeServiceImpl.java
@@ -0,0 +1,94 @@
+package com.hc.gpbusiness.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hc.gpbusiness.model.WebQrCode;
+import com.hc.gpbusiness.mapper.WebQrCodeMapper;
+import com.hc.gpbusiness.service.WebQrCodeService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 官网二维码表(WebQrCode)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-11-21 14:29:52
+ */
+
+@Service("webQrCodeService")
+public class WebQrCodeServiceImpl implements WebQrCodeService {
+
+    private final WebQrCodeMapper webQrCodeMapper;
+
+    public WebQrCodeServiceImpl(WebQrCodeMapper webQrCodeMapper) {
+        this.webQrCodeMapper = webQrCodeMapper;
+    }
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param qrId 主键
+     * @return 实例对象
+     */
+    @Override
+    public WebQrCode queryById(Integer qrId) {
+        return this.webQrCodeMapper.selectByPrimaryKey(qrId);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param webQrCode 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public WebQrCode insert(WebQrCode webQrCode) {
+        this.webQrCodeMapper.insert(webQrCode);
+        return webQrCode;
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param webQrCode 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public WebQrCode update(WebQrCode webQrCode) {
+        this.webQrCodeMapper.updateByPrimaryKeySelective(webQrCode);
+        return this.queryById(webQrCode.getQrId());
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param qrId 主键
+     * @return 是否成功
+     */
+    @Override
+    public boolean deleteById(Integer qrId) {
+        return this.webQrCodeMapper.deleteByPrimaryKey(qrId) > 0;
+    }
+
+    /**
+     * 分页查询多条数据
+     *
+     * @param page 页码
+     * @param size 查询条数
+     * @return 对象列表
+     */
+    @Override
+    public PageInfo queryAllByLimit(int page, int size) {
+        return PageHelper.startPage(page, size).doSelectPageInfo(this.webQrCodeMapper::selectAll);
+    }
+
+    @Override
+    public PageInfo queryByAll(int page, int size,String qrName1,
+                               String qrName2,
+                               Integer qrType,
+                               Integer qrId1,
+                               Integer qrId2,String fileName) {
+        return PageHelper.startPage(page, size).doSelectPageInfo(() -> this.webQrCodeMapper.queryByAll(qrName1,qrName2,qrType,qrId1,qrId2,fileName));
+    }
+}
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebNewsMapper.xml b/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebNewsMapper.xml
index 7837a6f..12bd387 100644
--- a/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebNewsMapper.xml
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebNewsMapper.xml
@@ -7,6 +7,7 @@
         <result property="newsTitle" column="news_title" jdbcType="VARCHAR"/>
         <result property="newsLogo" column="news_logo" jdbcType="VARCHAR"/>
         <result property="newsContent" column="news_content" jdbcType="VARCHAR"/>
+        <result property="newsUrl" column="news_url" jdbcType="VARCHAR"/>
         <result property="moduleId" column="module_id" jdbcType="INTEGER"/>
         <result property="typeId" column="type_id" jdbcType="INTEGER"/>
         <result property="flag" column="flag" jdbcType="INTEGER"/>
@@ -32,6 +33,7 @@
            news_title,
            news_logo,
            news_content,
+           news_url,
            module_id,
            type_id,
            flag,
diff --git a/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebQrCodeMapper.xml b/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebQrCodeMapper.xml
new file mode 100644
index 0000000..3cb0409
--- /dev/null
+++ b/JAVA_MYSQL_WEBSITE/gp-business/src/main/resources/mapper/WebQrCodeMapper.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hc.gpbusiness.mapper.WebQrCodeMapper">
+
+    <resultMap type="com.hc.gpbusiness.model.WebQrCode" id="WebQrCodeMap">
+        <result property="qrId" column="qr_id" jdbcType="INTEGER"/>
+        <result property="qrName1" column="qr_name1" jdbcType="VARCHAR"/>
+        <result property="qrName2" column="qr_name2" jdbcType="VARCHAR"/>
+        <result property="qrType" column="qr_type" jdbcType="VARCHAR"/>
+        <result property="qrId1" column="qr_id1" jdbcType="INTEGER"/>
+        <result property="qrId2" column="qr_id2" jdbcType="INTEGER"/>
+        <result property="fileName" column="file_name" jdbcType="VARCHAR"/>
+        <result property="fileUrl" column="file_url" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        qr_id,
+           qr_name1,
+           qr_name2,
+           qr_type,
+           qr_id1,
+           qr_id2,
+           file_name,
+           file_url
+    </sql>
+
+    <select id="queryByAll" resultType="com.hc.gpbusiness.model.WebQrCode">
+        SELECT
+        <include refid="Base_Column_List"/>
+        from web_qr_code
+        <where>
+            <if test="qrName1!=null and qrName1!=''">
+                AND qr_name1 LIKE "%"#{qrName1}"%"
+            </if>
+            <if test="qrName2!=null and qrName2!=''">
+                AND qr_name2 LIKE "%"#{qrName2}"%"
+            </if>
+            <if test="qrId1!=null">
+                AND qr_id1 = #{qrId1}
+            </if>
+            <if test="qrId2!=null">
+                AND qr_id2 = #{qrId2}
+            </if>
+            <if test="qrType!=null">
+                AND qr_type = #{qrType}
+            </if>
+            <if test="fileName!=null and fileName!=''">
+                AND file_name LIKE "%"#{fileName}"%"
+            </if>
+        </where>
+        ORDER BY qr_id asc
+    </select>
+
+</mapper>
diff --git a/JAVA_MYSQL_WEBSITE/gp-web/src/main/java/com/hc/gpweb/controller/front/FrontQrCodeController.java b/JAVA_MYSQL_WEBSITE/gp-web/src/main/java/com/hc/gpweb/controller/front/FrontQrCodeController.java
new file mode 100644
index 0000000..fec4e7b
--- /dev/null
+++ b/JAVA_MYSQL_WEBSITE/gp-web/src/main/java/com/hc/gpweb/controller/front/FrontQrCodeController.java
@@ -0,0 +1,44 @@
+package com.hc.gpweb.controller.front;
+
+import com.hc.gpbusiness.service.WebQrCodeService;
+import com.hc.gpcore.utils.result.Result;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 官网二维码表(WebQrCode)表控制层
+ *
+ * @author makejava
+ * @since 2024-11-21 14:30:55
+ */
+
+@RestController
+@RequestMapping("/api/front/QrCode")
+public class FrontQrCodeController {
+
+    /**
+     * 服务对象
+     */
+    private final WebQrCodeService webQrCodeService;
+
+    public FrontQrCodeController(WebQrCodeService webQrCodeService) {
+        this.webQrCodeService = webQrCodeService;
+    }
+
+
+    @GetMapping("/list")
+    @ApiOperation(value = "获取QR列表(分页)", response = Result.class)
+    public Result listZccmQrAccessory(@RequestParam(defaultValue = "0") Integer page,
+                                      @RequestParam(defaultValue = "0") Integer size,
+                                      @ApiParam(value = "qrName1") @RequestParam(required = false) String qrName1,
+                                      @ApiParam(value = "qrName2") @RequestParam(required = false) String qrName2,
+                                      @ApiParam(value = "12表示文件 视频") @RequestParam(required = false) Integer qrType,
+                                      @ApiParam(value = "章节ID") @RequestParam(required = false) Integer qrId1,
+                                      @ApiParam(value = "章节ID") @RequestParam(required = false) Integer qrId2,
+                                      @ApiParam(value = "文件名") @RequestParam(required = false) String fileName) {
+        return Result.success(webQrCodeService.queryByAll(page, size,qrName1,qrName2,qrType,qrId1,qrId2,fileName));
+    }
+
+}
diff --git a/JAVA_MYSQL_WEBSITE/gp-web/src/main/resources/application-dev.yml b/JAVA_MYSQL_WEBSITE/gp-web/src/main/resources/application-dev.yml
index 0863d19..9a7cf40 100644
--- a/JAVA_MYSQL_WEBSITE/gp-web/src/main/resources/application-dev.yml
+++ b/JAVA_MYSQL_WEBSITE/gp-web/src/main/resources/application-dev.yml
@@ -5,10 +5,10 @@ spring:
     username: gp_union
     password: gpUnion!123
   redis:
-    host: 223.108.133.166
+    host: 127.0.0.1
     database: 3
     port: 6379
-    password: mypass
+    password:
     timeout: 5000ms
     lettuce:
       pool: