From 4f33a6133b54d873dc794bdebcfd783597ea0595 Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期四, 17 十一月 2022 11:43:31 +0800
Subject: [PATCH] 表结构更新

---
 ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentInformationController.java    |   88 +++++++++
 ycl-platform/src/main/java/com/ycl/service/NewsInformationService.java                    |    2 
 ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelColumnServiceImpl.java         |    2 
 ycl-platform/src/main/java/com/ycl/entity/NewsPolice.java                                 |   31 ++-
 ycl-platform/src/main/java/com/ycl/service/NewsColumnInformationService.java              |    2 
 ycl-platform/src/main/java/com/ycl/controller/NewsChannelColumnController.java            |    2 
 ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnInformationServiceImpl.java     |    2 
 ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentController.java               |    2 
 ycl-platform/src/main/java/com/ycl/controller/NewsColumnInformationController.java        |    2 
 ycl-platform/src/main/java/com/ycl/service/impl/NewsAdminServiceImpl.java                 |    2 
 ycl-platform/src/main/java/com/ycl/entity/NewsChannelColumn.java                          |    2 
 ycl-platform/src/main/java/com/ycl/dao/NewsColumnInformationDao.java                      |    2 
 ycl-platform/src/main/java/com/ycl/entity/NewsColumn.java                                 |    8 
 ycl-platform/src/main/java/com/ycl/entity/NewsDuty.java                                   |    3 
 ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelServiceImpl.java               |    2 
 ycl-platform/src/main/java/com/ycl/controller/NewsColumnController.java                   |    2 
 ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml                   |   31 +++
 ycl-platform/src/main/java/com/ycl/entity/NewsAdmin.java                                  |    3 
 ycl-platform/src/main/java/com/ycl/entity/NewsIp.java                                     |    3 
 ycl-platform/src/main/java/com/ycl/controller/NewsAdminController.java                    |    2 
 ycl-platform/src/main/java/com/ycl/dao/NewsInformationDao.java                            |    2 
 ycl-platform/src/main/java/com/ycl/service/impl/NewsIpServiceImpl.java                    |    2 
 ycl-platform/src/main/resources/mapper/NewsInformationDao.xml                             |   11 
 ycl-platform/src/main/java/com/ycl/controller/NewsChannelController.java                  |    2 
 ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnServiceImpl.java                |    2 
 ycl-platform/src/main/java/com/ycl/entity/NewsChannel.java                                |    3 
 ycl-platform/src/main/resources/mapper/NewsPoliceDao.xml                                  |   13 
 ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentInformationDao.java                  |   35 +++
 ycl-platform/src/main/java/com/ycl/dao/NewsDutyDao.java                                   |    2 
 ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java           |    2 
 ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentServiceImpl.java            |    2 
 ycl-platform/src/main/java/com/ycl/service/NewsDepartmentInformationService.java          |   15 +
 ycl-platform/src/main/java/com/ycl/service/impl/NewsPoliceServiceImpl.java                |    2 
 ycl-platform/src/main/java/com/ycl/dao/NewsIpDao.java                                     |    2 
 ycl-platform/src/main/java/com/ycl/entity/NewsColumnInformation.java                      |    2 
 ycl-platform/src/main/java/com/ycl/service/impl/NewsDutyServiceImpl.java                  |    2 
 ycl-platform/src/main/java/com/ycl/service/NewsPoliceService.java                         |    2 
 .idea/easyCodeTableSetting.xml                                                            |   66 ++++++
 ycl-platform/src/main/java/com/ycl/dao/NewsChannelDao.java                                |    2 
 ycl-platform/src/main/java/com/ycl/dao/NewsChannelColumnDao.java                          |    2 
 ycl-platform/src/main/java/com/ycl/entity/NewsDepartment.java                             |    2 
 ycl-platform/src/main/java/com/ycl/entity/NewsInformation.java                            |   19 -
 ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentInformationServiceImpl.java |   19 ++
 ycl-platform/src/main/java/com/ycl/service/NewsColumnService.java                         |    2 
 ycl-platform/src/main/java/com/ycl/controller/NewsDutyController.java                     |    2 
 ycl-platform/src/main/java/com/ycl/controller/NewsInformationController.java              |    2 
 ycl-platform/src/main/java/com/ycl/dao/NewsAdminDao.java                                  |    2 
 ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentDao.java                             |    2 
 ycl-platform/src/main/java/com/ycl/service/NewsChannelColumnService.java                  |    2 
 ycl-platform/src/main/java/com/ycl/service/NewsDepartmentService.java                     |    2 
 ycl-platform/src/main/java/com/ycl/controller/NewsIpController.java                       |    2 
 ycl-platform/src/main/java/com/ycl/service/NewsChannelService.java                        |    2 
 ycl-platform/src/main/java/com/ycl/entity/NewsDepartmentInformation.java                  |   67 +++++++
 ycl-platform/src/main/java/com/ycl/service/NewsAdminService.java                          |    2 
 ycl-platform/src/main/java/com/ycl/controller/NewsPoliceController.java                   |    2 
 ycl-platform/src/main/java/com/ycl/dao/NewsColumnDao.java                                 |    2 
 ycl-platform/src/main/java/com/ycl/service/NewsIpService.java                             |    2 
 ycl-platform/src/main/java/com/ycl/dao/NewsPoliceDao.java                                 |    2 
 ycl-platform/src/main/java/com/ycl/service/NewsDutyService.java                           |    2 
 59 files changed, 407 insertions(+), 94 deletions(-)

diff --git a/.idea/easyCodeTableSetting.xml b/.idea/easyCodeTableSetting.xml
index 6c1548c..14479b1 100644
--- a/.idea/easyCodeTableSetting.xml
+++ b/.idea/easyCodeTableSetting.xml
@@ -86,10 +86,10 @@
                     <option name="type" value="java.lang.Integer" />
                   </ColumnInfoDTO>
                   <ColumnInfoDTO>
-                    <option name="comment" value="閮ㄩ棬id" />
+                    <option name="comment" value="璀﹀憳id" />
                     <option name="custom" value="false" />
                     <option name="ext" value="{}" />
-                    <option name="name" value="newsDepartmentId" />
+                    <option name="name" value="newsPoliceId" />
                     <option name="type" value="java.lang.Integer" />
                   </ColumnInfoDTO>
                 </list>
@@ -219,7 +219,7 @@
         <entry key="news_website.news_column_information">
           <value>
             <TableInfoDTO>
-              <option name="comment" value="鏍忕洰棰戦亾涓棿琛�" />
+              <option name="comment" value="鏍忕洰鍜ㄨ涓棿琛�" />
               <option name="fullColumn">
                 <list>
                   <ColumnInfoDTO>
@@ -256,6 +256,7 @@
         <entry key="news_website.news_department">
           <value>
             <TableInfoDTO>
+              <option name="comment" value="閮ㄩ棬锛堟満鏋勶級琛�" />
               <option name="fullColumn">
                 <list>
                   <ColumnInfoDTO>
@@ -279,6 +280,50 @@
               <option name="savePackageName" value="com.ycl" />
               <option name="savePath" value="./ycl-platform/src/main/java/com/ycl" />
               <option name="templateGroupName" value="MybatisPlus-Mixed" />
+            </TableInfoDTO>
+          </value>
+        </entry>
+        <entry key="news_website.news_department_information">
+          <value>
+            <TableInfoDTO>
+              <option name="comment" value="鏈烘瀯锛堥儴闂級涓棿琛�" />
+              <option name="fullColumn">
+                <list>
+                  <ColumnInfoDTO>
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="id" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="鏈烘瀯锛堥儴闂╥d锛�" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="newsDepartmentId" />
+                    <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="newsPoliceId" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="鏄惁绛炬敹0鏈鏀�1绛炬敹2涓嶉渶瑕佺鏀�" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="isSign" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                </list>
+              </option>
+              <option name="name" value="NewsDepartmentInformation" />
+              <option name="preName" value="" />
+              <option name="saveModelName" value="ycl-platform" />
+              <option name="savePackageName" value="com.ycl" />
+              <option name="savePath" value="./ycl-platform/src/main/java/com/ycl" />
+              <option name="templateGroupName" value="" />
             </TableInfoDTO>
           </value>
         </entry>
@@ -336,7 +381,7 @@
         <entry key="news_website.news_information">
           <value>
             <TableInfoDTO>
-              <option name="comment" value="鍜ㄨ琛�" />
+              <option name="comment" value="璧勮琛�" />
               <option name="fullColumn">
                 <list>
                   <ColumnInfoDTO>
@@ -368,7 +413,7 @@
                     <option name="type" value="java.util.Date" />
                   </ColumnInfoDTO>
                   <ColumnInfoDTO>
-                    <option name="comment" value="鏄惁绛炬敹1绛炬敹0鏈鏀�" />
+                    <option name="comment" value="鏄惁绛炬敹0鏈鏀�1绛炬敹2涓嶉渶瑕佺鏀�" />
                     <option name="custom" value="false" />
                     <option name="ext" value="{}" />
                     <option name="name" value="isSign" />
@@ -478,10 +523,17 @@
                     <option name="type" value="java.util.Date" />
                   </ColumnInfoDTO>
                   <ColumnInfoDTO>
-                    <option name="comment" value="鏈烘瀯鍚嶇О" />
+                    <option name="comment" value="鏈烘瀯id" />
                     <option name="custom" value="false" />
                     <option name="ext" value="{}" />
-                    <option name="name" value="organizationName" />
+                    <option name="name" value="newsDepartmentId" />
+                    <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="phone" />
                     <option name="type" value="java.lang.String" />
                   </ColumnInfoDTO>
                 </list>
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsAdminController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsAdminController.java
index f6bad66..24570d9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsAdminController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsAdminController.java
@@ -18,7 +18,7 @@
  * 鍚庡彴鐢ㄦ埛琛�(NewsAdmin)琛ㄦ帶鍒跺眰
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @RestController
 @RequestMapping("newsAdmin")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsChannelColumnController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsChannelColumnController.java
index 63fe19b..733019b 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsChannelColumnController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsChannelColumnController.java
@@ -18,7 +18,7 @@
  * 棰戦亾鏍忕洰涓棿琛�(NewsChannelColumn)琛ㄦ帶鍒跺眰
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @RestController
 @RequestMapping("newsChannelColumn")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsChannelController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsChannelController.java
index e08700b..8af1561 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsChannelController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsChannelController.java
@@ -18,7 +18,7 @@
  * 棰戦亾琛�(NewsChannel)琛ㄦ帶鍒跺眰
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @RestController
 @RequestMapping("newsChannel")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsColumnController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsColumnController.java
index cd09466..63916a4 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsColumnController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsColumnController.java
@@ -18,7 +18,7 @@
  * 鏍忕洰琛�(NewsColumn)琛ㄦ帶鍒跺眰
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @RestController
 @RequestMapping("newsColumn")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsColumnInformationController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsColumnInformationController.java
index f4595cc..f3ec01d 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsColumnInformationController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsColumnInformationController.java
@@ -18,7 +18,7 @@
  * 鏍忕洰鍜ㄨ涓棿琛�(NewsColumnInformation)琛ㄦ帶鍒跺眰
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @RestController
 @RequestMapping("newsColumnInformation")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentController.java
index acde8f7..6ff967e 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentController.java
@@ -18,7 +18,7 @@
  * 閮ㄩ棬锛堟満鏋勶級琛�(NewsDepartment)琛ㄦ帶鍒跺眰
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @RestController
 @RequestMapping("newsDepartment")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentInformationController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentInformationController.java
new file mode 100644
index 0000000..ba5b87c
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentInformationController.java
@@ -0,0 +1,88 @@
+package com.ycl.controller;
+
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.entity.NewsDepartmentInformation;
+import com.ycl.service.NewsDepartmentInformationService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 鏈烘瀯锛堥儴闂級涓棿琛�(NewsDepartmentInformation)琛ㄦ帶鍒跺眰
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+@RestController
+@RequestMapping("newsDepartmentInformation")
+public class NewsDepartmentInformationController extends ApiController {
+    /**
+     * 鏈嶅姟瀵硅薄
+     */
+    @Resource
+    private NewsDepartmentInformationService newsDepartmentInformationService;
+
+    /**
+     * 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
+     *
+     * @param page 鍒嗛〉瀵硅薄
+     * @param newsDepartmentInformation 鏌ヨ瀹炰綋
+     * @return 鎵�鏈夋暟鎹�
+     */
+    @GetMapping
+    public R selectAll(Page<NewsDepartmentInformation> page, NewsDepartmentInformation newsDepartmentInformation) {
+        return success(this.newsDepartmentInformationService.page(page, new QueryWrapper<>(newsDepartmentInformation)));
+    }
+
+    /**
+     * 閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁
+     *
+     * @param id 涓婚敭
+     * @return 鍗曟潯鏁版嵁
+     */
+    @GetMapping("{id}")
+    public R selectOne(@PathVariable Serializable id) {
+        return success(this.newsDepartmentInformationService.getById(id));
+    }
+
+    /**
+     * 鏂板鏁版嵁
+     *
+     * @param newsDepartmentInformation 瀹炰綋瀵硅薄
+     * @return 鏂板缁撴灉
+     */
+    @PostMapping
+    public R insert(@RequestBody NewsDepartmentInformation newsDepartmentInformation) {
+        return success(this.newsDepartmentInformationService.save(newsDepartmentInformation));
+    }
+
+    /**
+     * 淇敼鏁版嵁
+     *
+     * @param newsDepartmentInformation 瀹炰綋瀵硅薄
+     * @return 淇敼缁撴灉
+     */
+    @PutMapping
+    public R update(@RequestBody NewsDepartmentInformation newsDepartmentInformation) {
+        return success(this.newsDepartmentInformationService.updateById(newsDepartmentInformation));
+    }
+
+    /**
+     * 鍒犻櫎鏁版嵁
+     *
+     * @param idList 涓婚敭缁撳悎
+     * @return 鍒犻櫎缁撴灉
+     */
+    @DeleteMapping
+    public R delete(@RequestParam("idList") List<Long> idList) {
+        return success(this.newsDepartmentInformationService.removeByIds(idList));
+    }
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsDutyController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsDutyController.java
index 6540bfa..67f3011 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsDutyController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsDutyController.java
@@ -18,7 +18,7 @@
  * 鍊肩彮琛�(NewsDuty)琛ㄦ帶鍒跺眰
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @RestController
 @RequestMapping("newsDuty")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsInformationController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsInformationController.java
index 8c0abd8..7813bbc 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsInformationController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsInformationController.java
@@ -18,7 +18,7 @@
  * 璧勮琛�(NewsInformation)琛ㄦ帶鍒跺眰
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @RestController
 @RequestMapping("newsInformation")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsIpController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsIpController.java
index 9067ed8..5ddc4f5 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsIpController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsIpController.java
@@ -18,7 +18,7 @@
  * ip鐧藉悕鍗曡〃(NewsIp)琛ㄦ帶鍒跺眰
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @RestController
 @RequestMapping("newsIp")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsPoliceController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsPoliceController.java
index f135613..c0cd728 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsPoliceController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsPoliceController.java
@@ -19,7 +19,7 @@
 (NewsPolice)琛ㄦ帶鍒跺眰
  *
  * @author makejava
- * @since 2022-11-17 11:12:42
+ * @since 2022-11-17 11:38:27
  */
 @RestController
 @RequestMapping("newsPolice")
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsAdminDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsAdminDao.java
index caa8a59..12c327e 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsAdminDao.java
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsAdminDao.java
@@ -10,7 +10,7 @@
  * 鍚庡彴鐢ㄦ埛琛�(NewsAdmin)琛ㄦ暟鎹簱璁块棶灞�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsAdminDao extends BaseMapper<NewsAdmin> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsChannelColumnDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsChannelColumnDao.java
index 7efc635..585165a 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsChannelColumnDao.java
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsChannelColumnDao.java
@@ -10,7 +10,7 @@
  * 棰戦亾鏍忕洰涓棿琛�(NewsChannelColumn)琛ㄦ暟鎹簱璁块棶灞�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsChannelColumnDao extends BaseMapper<NewsChannelColumn> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsChannelDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsChannelDao.java
index e8bb4b6..e4774d6 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsChannelDao.java
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsChannelDao.java
@@ -10,7 +10,7 @@
  * 棰戦亾琛�(NewsChannel)琛ㄦ暟鎹簱璁块棶灞�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsChannelDao extends BaseMapper<NewsChannel> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsColumnDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsColumnDao.java
index 126cf98..3a41ec9 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsColumnDao.java
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsColumnDao.java
@@ -10,7 +10,7 @@
  * 鏍忕洰琛�(NewsColumn)琛ㄦ暟鎹簱璁块棶灞�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsColumnDao extends BaseMapper<NewsColumn> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsColumnInformationDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsColumnInformationDao.java
index ecc78fe..aafb5c6 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsColumnInformationDao.java
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsColumnInformationDao.java
@@ -10,7 +10,7 @@
  * 鏍忕洰鍜ㄨ涓棿琛�(NewsColumnInformation)琛ㄦ暟鎹簱璁块棶灞�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsColumnInformationDao extends BaseMapper<NewsColumnInformation> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentDao.java
index 01035a3..5ea9059 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentDao.java
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentDao.java
@@ -10,7 +10,7 @@
  * 閮ㄩ棬锛堟満鏋勶級琛�(NewsDepartment)琛ㄦ暟鎹簱璁块棶灞�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsDepartmentDao extends BaseMapper<NewsDepartment> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentInformationDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentInformationDao.java
new file mode 100644
index 0000000..f065029
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentInformationDao.java
@@ -0,0 +1,35 @@
+package com.ycl.dao;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.ycl.entity.NewsDepartmentInformation;
+
+/**
+ * 鏈烘瀯锛堥儴闂級涓棿琛�(NewsDepartmentInformation)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+public interface NewsDepartmentInformationDao extends BaseMapper<NewsDepartmentInformation> {
+
+/**
+* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsDepartmentInformation> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+*/
+int insertBatch(@Param("entities") List<NewsDepartmentInformation> entities);
+
+/**
+* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsDepartmentInformation> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
+*/
+int insertOrUpdateBatch(@Param("entities") List<NewsDepartmentInformation> entities);
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsDutyDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsDutyDao.java
index c6ee4a3..14ddeb3 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsDutyDao.java
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsDutyDao.java
@@ -10,7 +10,7 @@
  * 鍊肩彮琛�(NewsDuty)琛ㄦ暟鎹簱璁块棶灞�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsDutyDao extends BaseMapper<NewsDuty> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsInformationDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsInformationDao.java
index 5199fb3..7b009ed 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsInformationDao.java
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsInformationDao.java
@@ -10,7 +10,7 @@
  * 璧勮琛�(NewsInformation)琛ㄦ暟鎹簱璁块棶灞�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsInformationDao extends BaseMapper<NewsInformation> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsIpDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsIpDao.java
index 1fa5408..06cfd6c 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsIpDao.java
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsIpDao.java
@@ -10,7 +10,7 @@
  * ip鐧藉悕鍗曡〃(NewsIp)琛ㄦ暟鎹簱璁块棶灞�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsIpDao extends BaseMapper<NewsIp> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsPoliceDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsPoliceDao.java
index 5b59186..2c0f863 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsPoliceDao.java
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsPoliceDao.java
@@ -11,7 +11,7 @@
 (NewsPolice)琛ㄦ暟鎹簱璁块棶灞�
  *
  * @author makejava
- * @since 2022-11-17 11:12:42
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsPoliceDao extends BaseMapper<NewsPolice> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsAdmin.java b/ycl-platform/src/main/java/com/ycl/entity/NewsAdmin.java
index 2bdb790..3fdb2f7 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsAdmin.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsAdmin.java
@@ -3,12 +3,13 @@
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.sql.Date;
 
 /**
  * 鍚庡彴鐢ㄦ埛琛�(NewsAdmin)琛ㄥ疄浣撶被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @SuppressWarnings("serial")
 public class NewsAdmin extends Model<NewsAdmin> {
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsChannel.java b/ycl-platform/src/main/java/com/ycl/entity/NewsChannel.java
index 3ca7b74..957e9ea 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsChannel.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsChannel.java
@@ -3,12 +3,13 @@
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.sql.Date;
 
 /**
  * 棰戦亾琛�(NewsChannel)琛ㄥ疄浣撶被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @SuppressWarnings("serial")
 public class NewsChannel extends Model<NewsChannel> {
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsChannelColumn.java b/ycl-platform/src/main/java/com/ycl/entity/NewsChannelColumn.java
index d04418b..52d1236 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsChannelColumn.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsChannelColumn.java
@@ -8,7 +8,7 @@
  * 棰戦亾鏍忕洰涓棿琛�(NewsChannelColumn)琛ㄥ疄浣撶被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @SuppressWarnings("serial")
 public class NewsChannelColumn extends Model<NewsChannelColumn> {
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsColumn.java b/ycl-platform/src/main/java/com/ycl/entity/NewsColumn.java
index 66f766f..b6625cd 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsColumn.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsColumn.java
@@ -8,21 +8,21 @@
  * 鏍忕洰琛�(NewsColumn)琛ㄥ疄浣撶被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @SuppressWarnings("serial")
 public class NewsColumn extends Model<NewsColumn> {
     //id
-    private Object id;
+    private Integer id;
     //鏍忕洰鍚嶇О
     private String name;
 
 
-    public Object getId() {
+    public Integer getId() {
         return id;
     }
 
-    public void setId(Object id) {
+    public void setId(Integer id) {
         this.id = id;
     }
 
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsColumnInformation.java b/ycl-platform/src/main/java/com/ycl/entity/NewsColumnInformation.java
index 491d8bd..98511f1 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsColumnInformation.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsColumnInformation.java
@@ -8,7 +8,7 @@
  * 鏍忕洰鍜ㄨ涓棿琛�(NewsColumnInformation)琛ㄥ疄浣撶被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @SuppressWarnings("serial")
 public class NewsColumnInformation extends Model<NewsColumnInformation> {
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsDepartment.java b/ycl-platform/src/main/java/com/ycl/entity/NewsDepartment.java
index 8018551..a148a59 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsDepartment.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsDepartment.java
@@ -8,7 +8,7 @@
  * 閮ㄩ棬锛堟満鏋勶級琛�(NewsDepartment)琛ㄥ疄浣撶被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @SuppressWarnings("serial")
 public class NewsDepartment extends Model<NewsDepartment> {
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsDepartmentInformation.java b/ycl-platform/src/main/java/com/ycl/entity/NewsDepartmentInformation.java
new file mode 100644
index 0000000..1d97e7e
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsDepartmentInformation.java
@@ -0,0 +1,67 @@
+package com.ycl.entity;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+
+/**
+ * 鏈烘瀯锛堥儴闂級涓棿琛�(NewsDepartmentInformation)琛ㄥ疄浣撶被
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+@SuppressWarnings("serial")
+public class NewsDepartmentInformation extends Model<NewsDepartmentInformation> {
+    
+    private Integer id;
+    //鏈烘瀯锛堥儴闂╥d锛�
+    private Integer newsDepartmentId;
+    //璀﹀憳id
+    private Integer newsPoliceId;
+    //鏄惁绛炬敹0鏈鏀�1绛炬敹2涓嶉渶瑕佺鏀�
+    private Integer isSign;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getNewsDepartmentId() {
+        return newsDepartmentId;
+    }
+
+    public void setNewsDepartmentId(Integer newsDepartmentId) {
+        this.newsDepartmentId = newsDepartmentId;
+    }
+
+    public Integer getNewsPoliceId() {
+        return newsPoliceId;
+    }
+
+    public void setNewsPoliceId(Integer newsPoliceId) {
+        this.newsPoliceId = newsPoliceId;
+    }
+
+    public Integer getIsSign() {
+        return isSign;
+    }
+
+    public void setIsSign(Integer isSign) {
+        this.isSign = isSign;
+    }
+
+    /**
+     * 鑾峰彇涓婚敭鍊�
+     *
+     * @return 涓婚敭鍊�
+     */
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+    }
+
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsDuty.java b/ycl-platform/src/main/java/com/ycl/entity/NewsDuty.java
index eb8d219..83bb036 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsDuty.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsDuty.java
@@ -3,12 +3,13 @@
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.sql.Date;
 
 /**
  * 鍊肩彮琛�(NewsDuty)琛ㄥ疄浣撶被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @SuppressWarnings("serial")
 public class NewsDuty extends Model<NewsDuty> {
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsInformation.java b/ycl-platform/src/main/java/com/ycl/entity/NewsInformation.java
index d78cc41..4de5a1d 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsInformation.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsInformation.java
@@ -3,17 +3,18 @@
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.sql.Date;
 
 /**
  * 璧勮琛�(NewsInformation)琛ㄥ疄浣撶被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @SuppressWarnings("serial")
 public class NewsInformation extends Model<NewsInformation> {
     //id
-    private Object id;
+    private Integer id;
     //鏍囬
     private String title;
     //鍐呭
@@ -28,15 +29,13 @@
     private Object sendTo;
     //鍥剧墖鍦板潃
     private String imageUrl;
-    //閮ㄩ棬锛堟満鏋勶級id
-    private String newsDepartmentId;
 
 
-    public Object getId() {
+    public Integer getId() {
         return id;
     }
 
-    public void setId(Object id) {
+    public void setId(Integer id) {
         this.id = id;
     }
 
@@ -94,14 +93,6 @@
 
     public void setImageUrl(String imageUrl) {
         this.imageUrl = imageUrl;
-    }
-
-    public String getNewsDepartmentId() {
-        return newsDepartmentId;
-    }
-
-    public void setNewsDepartmentId(String newsDepartmentId) {
-        this.newsDepartmentId = newsDepartmentId;
     }
 
     /**
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsIp.java b/ycl-platform/src/main/java/com/ycl/entity/NewsIp.java
index 8c58e6e..dc121cb 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsIp.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsIp.java
@@ -3,12 +3,13 @@
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.sql.Date;
 
 /**
  * ip鐧藉悕鍗曡〃(NewsIp)琛ㄥ疄浣撶被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @SuppressWarnings("serial")
 public class NewsIp extends Model<NewsIp> {
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsPolice.java b/ycl-platform/src/main/java/com/ycl/entity/NewsPolice.java
index e111570..03ca160 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsPolice.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsPolice.java
@@ -3,33 +3,36 @@
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.sql.Date;
 
 /**
  * 璀﹀憳琛�
 (NewsPolice)琛ㄥ疄浣撶被
  *
  * @author makejava
- * @since 2022-11-17 11:12:42
+ * @since 2022-11-17 11:38:27
  */
 @SuppressWarnings("serial")
 public class NewsPolice extends Model<NewsPolice> {
     //鑷涓婚敭
-    private Object id;
+    private Integer id;
     //璀﹀憳鍚嶇О
     private String rname;
     //鍒涘缓鏃堕棿
     private Date createTime;
     //淇敼鏃堕棿
     private Date updateTime;
-    //鏈烘瀯鍚嶇О
-    private String organizationName;
+    //鏈烘瀯id
+    private String newsDepartmentId;
+    //鎵嬫満鍙风爜
+    private String phone;
 
 
-    public Object getId() {
+    public Integer getId() {
         return id;
     }
 
-    public void setId(Object id) {
+    public void setId(Integer id) {
         this.id = id;
     }
 
@@ -57,12 +60,20 @@
         this.updateTime = updateTime;
     }
 
-    public String getOrganizationName() {
-        return organizationName;
+    public String getNewsDepartmentId() {
+        return newsDepartmentId;
     }
 
-    public void setOrganizationName(String organizationName) {
-        this.organizationName = organizationName;
+    public void setNewsDepartmentId(String newsDepartmentId) {
+        this.newsDepartmentId = newsDepartmentId;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
     }
 
     /**
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsAdminService.java b/ycl-platform/src/main/java/com/ycl/service/NewsAdminService.java
index 0e583ea..a35b941 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsAdminService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsAdminService.java
@@ -7,7 +7,7 @@
  * 鍚庡彴鐢ㄦ埛琛�(NewsAdmin)琛ㄦ湇鍔℃帴鍙�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsAdminService extends IService<NewsAdmin> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsChannelColumnService.java b/ycl-platform/src/main/java/com/ycl/service/NewsChannelColumnService.java
index 014e30c..6707082 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsChannelColumnService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsChannelColumnService.java
@@ -7,7 +7,7 @@
  * 棰戦亾鏍忕洰涓棿琛�(NewsChannelColumn)琛ㄦ湇鍔℃帴鍙�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsChannelColumnService extends IService<NewsChannelColumn> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsChannelService.java b/ycl-platform/src/main/java/com/ycl/service/NewsChannelService.java
index 3cddbf9..f2e940c 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsChannelService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsChannelService.java
@@ -7,7 +7,7 @@
  * 棰戦亾琛�(NewsChannel)琛ㄦ湇鍔℃帴鍙�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsChannelService extends IService<NewsChannel> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsColumnInformationService.java b/ycl-platform/src/main/java/com/ycl/service/NewsColumnInformationService.java
index bb4b592..d7d2708 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsColumnInformationService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsColumnInformationService.java
@@ -7,7 +7,7 @@
  * 鏍忕洰鍜ㄨ涓棿琛�(NewsColumnInformation)琛ㄦ湇鍔℃帴鍙�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsColumnInformationService extends IService<NewsColumnInformation> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsColumnService.java b/ycl-platform/src/main/java/com/ycl/service/NewsColumnService.java
index 3424d79..4aa99a7 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsColumnService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsColumnService.java
@@ -7,7 +7,7 @@
  * 鏍忕洰琛�(NewsColumn)琛ㄦ湇鍔℃帴鍙�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsColumnService extends IService<NewsColumn> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsDepartmentInformationService.java b/ycl-platform/src/main/java/com/ycl/service/NewsDepartmentInformationService.java
new file mode 100644
index 0000000..282cfb9
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsDepartmentInformationService.java
@@ -0,0 +1,15 @@
+package com.ycl.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.NewsDepartmentInformation;
+
+/**
+ * 鏈烘瀯锛堥儴闂級涓棿琛�(NewsDepartmentInformation)琛ㄦ湇鍔℃帴鍙�
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+public interface NewsDepartmentInformationService extends IService<NewsDepartmentInformation> {
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsDepartmentService.java b/ycl-platform/src/main/java/com/ycl/service/NewsDepartmentService.java
index dd5bfbe..a2d38f6 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsDepartmentService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsDepartmentService.java
@@ -7,7 +7,7 @@
  * 閮ㄩ棬锛堟満鏋勶級琛�(NewsDepartment)琛ㄦ湇鍔℃帴鍙�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsDepartmentService extends IService<NewsDepartment> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsDutyService.java b/ycl-platform/src/main/java/com/ycl/service/NewsDutyService.java
index 6fedc2c..a7d2754 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsDutyService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsDutyService.java
@@ -7,7 +7,7 @@
  * 鍊肩彮琛�(NewsDuty)琛ㄦ湇鍔℃帴鍙�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsDutyService extends IService<NewsDuty> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsInformationService.java b/ycl-platform/src/main/java/com/ycl/service/NewsInformationService.java
index 788c1ad..5a6075d 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsInformationService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsInformationService.java
@@ -7,7 +7,7 @@
  * 璧勮琛�(NewsInformation)琛ㄦ湇鍔℃帴鍙�
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsInformationService extends IService<NewsInformation> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsIpService.java b/ycl-platform/src/main/java/com/ycl/service/NewsIpService.java
index 8ec7d67..24fbf14 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsIpService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsIpService.java
@@ -7,7 +7,7 @@
  * ip鐧藉悕鍗曡〃(NewsIp)琛ㄦ湇鍔℃帴鍙�
  *
  * @author makejava
- * @since 2022-11-17 11:12:42
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsIpService extends IService<NewsIp> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsPoliceService.java b/ycl-platform/src/main/java/com/ycl/service/NewsPoliceService.java
index 07b5efb..2f73812 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsPoliceService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsPoliceService.java
@@ -8,7 +8,7 @@
 (NewsPolice)琛ㄦ湇鍔℃帴鍙�
  *
  * @author makejava
- * @since 2022-11-17 11:12:42
+ * @since 2022-11-17 11:38:27
  */
 public interface NewsPoliceService extends IService<NewsPolice> {
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsAdminServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsAdminServiceImpl.java
index b3a0a01..3bd4782 100644
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsAdminServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsAdminServiceImpl.java
@@ -10,7 +10,7 @@
  * 鍚庡彴鐢ㄦ埛琛�(NewsAdmin)琛ㄦ湇鍔″疄鐜扮被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @Service("newsAdminService")
 public class NewsAdminServiceImpl extends ServiceImpl<NewsAdminDao, NewsAdmin> implements NewsAdminService {
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelColumnServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelColumnServiceImpl.java
index 9265623..551481a 100644
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelColumnServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelColumnServiceImpl.java
@@ -10,7 +10,7 @@
  * 棰戦亾鏍忕洰涓棿琛�(NewsChannelColumn)琛ㄦ湇鍔″疄鐜扮被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @Service("newsChannelColumnService")
 public class NewsChannelColumnServiceImpl extends ServiceImpl<NewsChannelColumnDao, NewsChannelColumn> implements NewsChannelColumnService {
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelServiceImpl.java
index b001ac9..b08da6e 100644
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelServiceImpl.java
@@ -10,7 +10,7 @@
  * 棰戦亾琛�(NewsChannel)琛ㄦ湇鍔″疄鐜扮被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @Service("newsChannelService")
 public class NewsChannelServiceImpl extends ServiceImpl<NewsChannelDao, NewsChannel> implements NewsChannelService {
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnInformationServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnInformationServiceImpl.java
index 38b7d71..eeeb3ad 100644
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnInformationServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnInformationServiceImpl.java
@@ -10,7 +10,7 @@
  * 鏍忕洰鍜ㄨ涓棿琛�(NewsColumnInformation)琛ㄦ湇鍔″疄鐜扮被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @Service("newsColumnInformationService")
 public class NewsColumnInformationServiceImpl extends ServiceImpl<NewsColumnInformationDao, NewsColumnInformation> implements NewsColumnInformationService {
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnServiceImpl.java
index 533c627..a811dd9 100644
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnServiceImpl.java
@@ -10,7 +10,7 @@
  * 鏍忕洰琛�(NewsColumn)琛ㄦ湇鍔″疄鐜扮被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @Service("newsColumnService")
 public class NewsColumnServiceImpl extends ServiceImpl<NewsColumnDao, NewsColumn> implements NewsColumnService {
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentInformationServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentInformationServiceImpl.java
new file mode 100644
index 0000000..850bdae
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentInformationServiceImpl.java
@@ -0,0 +1,19 @@
+package com.ycl.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.dao.NewsDepartmentInformationDao;
+import com.ycl.entity.NewsDepartmentInformation;
+import com.ycl.service.NewsDepartmentInformationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 鏈烘瀯锛堥儴闂級涓棿琛�(NewsDepartmentInformation)琛ㄦ湇鍔″疄鐜扮被
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+@Service("newsDepartmentInformationService")
+public class NewsDepartmentInformationServiceImpl extends ServiceImpl<NewsDepartmentInformationDao, NewsDepartmentInformation> implements NewsDepartmentInformationService {
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentServiceImpl.java
index bfc8f59..2ebbf0d 100644
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentServiceImpl.java
@@ -10,7 +10,7 @@
  * 閮ㄩ棬锛堟満鏋勶級琛�(NewsDepartment)琛ㄦ湇鍔″疄鐜扮被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @Service("newsDepartmentService")
 public class NewsDepartmentServiceImpl extends ServiceImpl<NewsDepartmentDao, NewsDepartment> implements NewsDepartmentService {
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsDutyServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsDutyServiceImpl.java
index aaa9705..8be6bcf 100644
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsDutyServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsDutyServiceImpl.java
@@ -10,7 +10,7 @@
  * 鍊肩彮琛�(NewsDuty)琛ㄦ湇鍔″疄鐜扮被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @Service("newsDutyService")
 public class NewsDutyServiceImpl extends ServiceImpl<NewsDutyDao, NewsDuty> implements NewsDutyService {
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java
index 6052beb..1a4850e 100644
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java
@@ -10,7 +10,7 @@
  * 璧勮琛�(NewsInformation)琛ㄦ湇鍔″疄鐜扮被
  *
  * @author makejava
- * @since 2022-11-17 11:12:41
+ * @since 2022-11-17 11:38:27
  */
 @Service("newsInformationService")
 public class NewsInformationServiceImpl extends ServiceImpl<NewsInformationDao, NewsInformation> implements NewsInformationService {
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsIpServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsIpServiceImpl.java
index ff72337..d8c9bb4 100644
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsIpServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsIpServiceImpl.java
@@ -10,7 +10,7 @@
  * ip鐧藉悕鍗曡〃(NewsIp)琛ㄦ湇鍔″疄鐜扮被
  *
  * @author makejava
- * @since 2022-11-17 11:12:42
+ * @since 2022-11-17 11:38:27
  */
 @Service("newsIpService")
 public class NewsIpServiceImpl extends ServiceImpl<NewsIpDao, NewsIp> implements NewsIpService {
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsPoliceServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsPoliceServiceImpl.java
index d1f352f..2ca2d41 100644
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsPoliceServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsPoliceServiceImpl.java
@@ -11,7 +11,7 @@
 (NewsPolice)琛ㄦ湇鍔″疄鐜扮被
  *
  * @author makejava
- * @since 2022-11-17 11:12:42
+ * @since 2022-11-17 11:38:27
  */
 @Service("newsPoliceService")
 public class NewsPoliceServiceImpl extends ServiceImpl<NewsPoliceDao, NewsPolice> implements NewsPoliceService {
diff --git a/ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml b/ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml
new file mode 100644
index 0000000..6a364f1
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml
@@ -0,0 +1,31 @@
+<?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.ycl.dao.NewsDepartmentInformationDao">
+
+    <resultMap type="com.ycl.entity.NewsDepartmentInformation" id="NewsDepartmentInformationMap">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="newsDepartmentId" column="news_department_id" jdbcType="INTEGER"/>
+        <result property="newsPoliceId" column="news_police_id" jdbcType="INTEGER"/>
+        <result property="isSign" column="is_sign" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <!-- 鎵归噺鎻掑叆 -->
+    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into news_website.news_department_information(news_department_id, news_police_id, is_sign)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+        (#{entity.newsDepartmentId}, #{entity.newsPoliceId}, #{entity.isSign})
+        </foreach>
+    </insert>
+    <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
+    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into news_website.news_department_information(news_department_id, news_police_id, is_sign)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.newsDepartmentId}, #{entity.newsPoliceId}, #{entity.isSign})
+        </foreach>
+        on duplicate key update
+         news_department_id = values(news_department_id) , news_police_id = values(news_police_id) , is_sign = values(is_sign)     </insert>
+
+</mapper>
+
diff --git a/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml b/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml
index a82123f..a82c74d 100644
--- a/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml
@@ -11,26 +11,25 @@
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="sendTo" column="send_to" jdbcType="VARCHAR"/>
         <result property="imageUrl" column="image_url" jdbcType="VARCHAR"/>
-        <result property="newsDepartmentId" column="news_department_id" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!-- 鎵归噺鎻掑叆 -->
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into news_website.news_information(title, content, publish_time, is_sign, create_time, send_to, image_url, news_department_id)
+        insert into news_website.news_information(title, content, publish_time, is_sign, create_time, send_to, image_url)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.title}, #{entity.content}, #{entity.publishTime}, #{entity.isSign}, #{entity.createTime}, #{entity.sendTo}, #{entity.imageUrl}, #{entity.newsDepartmentId})
+        (#{entity.title}, #{entity.content}, #{entity.publishTime}, #{entity.isSign}, #{entity.createTime}, #{entity.sendTo}, #{entity.imageUrl})
         </foreach>
     </insert>
     <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into news_website.news_information(title, content, publish_time, is_sign, create_time, send_to, image_url, news_department_id)
+        insert into news_website.news_information(title, content, publish_time, is_sign, create_time, send_to, image_url)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.title}, #{entity.content}, #{entity.publishTime}, #{entity.isSign}, #{entity.createTime}, #{entity.sendTo}, #{entity.imageUrl}, #{entity.newsDepartmentId})
+            (#{entity.title}, #{entity.content}, #{entity.publishTime}, #{entity.isSign}, #{entity.createTime}, #{entity.sendTo}, #{entity.imageUrl})
         </foreach>
         on duplicate key update
-         title = values(title) , content = values(content) , publish_time = values(publish_time) , is_sign = values(is_sign) , create_time = values(create_time) , send_to = values(send_to) , image_url = values(image_url) , news_department_id = values(news_department_id)     </insert>
+         title = values(title) , content = values(content) , publish_time = values(publish_time) , is_sign = values(is_sign) , create_time = values(create_time) , send_to = values(send_to) , image_url = values(image_url)     </insert>
 
 </mapper>
 
diff --git a/ycl-platform/src/main/resources/mapper/NewsPoliceDao.xml b/ycl-platform/src/main/resources/mapper/NewsPoliceDao.xml
index ea8b6d9..dcfda73 100644
--- a/ycl-platform/src/main/resources/mapper/NewsPoliceDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsPoliceDao.xml
@@ -7,26 +7,27 @@
         <result property="rname" column="rname" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-        <result property="organizationName" column="organization_name" jdbcType="VARCHAR"/>
+        <result property="newsDepartmentId" column="news_department_id" jdbcType="VARCHAR"/>
+        <result property="phone" column="phone" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!-- 鎵归噺鎻掑叆 -->
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into news_website.news_police(rname, create_time, update_time, organization_name)
+        insert into news_website.news_police(rname, create_time, update_time, news_department_id, phone)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.rname}, #{entity.createTime}, #{entity.updateTime}, #{entity.organizationName})
+        (#{entity.rname}, #{entity.createTime}, #{entity.updateTime}, #{entity.newsDepartmentId}, #{entity.phone})
         </foreach>
     </insert>
     <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into news_website.news_police(rname, create_time, update_time, organization_name)
+        insert into news_website.news_police(rname, create_time, update_time, news_department_id, phone)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.rname}, #{entity.createTime}, #{entity.updateTime}, #{entity.organizationName})
+            (#{entity.rname}, #{entity.createTime}, #{entity.updateTime}, #{entity.newsDepartmentId}, #{entity.phone})
         </foreach>
         on duplicate key update
-         rname = values(rname) , create_time = values(create_time) , update_time = values(update_time) , organization_name = values(organization_name)     </insert>
+         rname = values(rname) , create_time = values(create_time) , update_time = values(update_time) , news_department_id = values(news_department_id) , phone = values(phone)     </insert>
 
 </mapper>
 

--
Gitblit v1.8.0