From e413320d3a72baf7a631aeb56c05456de3cb4f1f Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期四, 17 十一月 2022 15:23:33 +0800
Subject: [PATCH] 创建警员自动创捷账号接口
---
ycl-platform/src/main/java/com/ycl/mapper/NewsDepartmentDao.java | 2
ycl-platform/src/main/java/com/ycl/mapper/NewsInformationDao.java | 70 +-
ycl-platform/src/main/resources/mapper/NewsInformationPoliceDao.xml | 31 +
ycl-platform/src/main/java/com/ycl/mapper/NewsIpDao.java | 70 +-
ycl-platform/src/main/resources/application-dev.yml | 134 +++---
ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelColumnServiceImpl.java | 2
ycl-platform/src/main/resources/mapper/NewsChannelColumnDao.xml | 2
ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationServiceImpl.java | 2
ycl-platform/src/main/java/com/ycl/mapper/NewsDutyDao.java | 70 +-
ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentServiceImpl.java | 2
ycl-platform/src/main/java/com/ycl/controller/NewsInformationPoliceController.java | 88 ++++
ycl-platform/src/main/java/com/ycl/entity/NewsPolice.java | 4
ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationPoliceServiceImpl.java | 19
ycl-platform/src/main/java/com/ycl/service/impl/NewsPoliceServiceImpl.java | 13
ycl-platform/src/main/java/com/ycl/service/impl/NewsDutyServiceImpl.java | 2
ycl-platform/src/main/resources/mapper/NewsDepartmentDao.xml | 2
ycl-platform/src/main/resources/mapper/NewsIpDao.xml | 2
ycl-platform/src/main/java/com/ycl/service/NewsPoliceService.java | 2
ycl-platform/src/main/resources/mapper/NewsColumnDao.xml | 2
ycl-platform/src/main/resources/mapper/NewsDutyDao.xml | 2
ycl-platform/src/main/java/com/ycl/entity/NewsInformationPolice.java | 18
.idea/easyCodeTableSetting.xml | 44 ++
ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnInformationServiceImpl.java | 2
ycl-platform/src/main/java/com/ycl/mapper/NewsAdminDao.java | 2
ycl-platform/src/main/java/com/ycl/dao/NewsInformationPoliceDao.java | 35 +
ycl-platform/src/main/java/com/ycl/service/impl/NewsAdminServiceImpl.java | 26 +
ycl-platform/src/main/java/com/ycl/service/impl/NewsChannelServiceImpl.java | 2
ycl-platform/src/main/resources/mapper/NewsAdminDao.xml | 2
ycl-platform/src/main/java/com/ycl/mapper/NewsChannelDao.java | 70 +-
ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml | 2
ycl-platform/src/main/java/com/ycl/entity/NewsAdmin.java | 2
ycl-platform/src/main/java/com/ycl/mapper/NewsChannelColumnDao.java | 70 +-
ycl-platform/src/main/java/com/ycl/mapper/NewsColumnDao.java | 70 +-
ycl-platform/src/main/resources/mapper/NewsColumnInformationDao.xml | 2
/dev/null | 32 -
ycl-platform/src/main/java/com/ycl/service/impl/NewsIpServiceImpl.java | 2
ycl-platform/src/main/java/com/ycl/service/NewsAdminService.java | 3
ycl-platform/src/main/java/com/ycl/service/NewsInformationPoliceService.java | 15
ycl-platform/src/main/java/com/ycl/controller/NewsPoliceController.java | 11
ycl-platform/src/main/resources/mapper/NewsInformationDao.xml | 2
ycl-platform/src/main/java/com/ycl/mapper/NewsColumnInformationDao.java | 70 +-
ycl-platform/src/main/java/com/ycl/service/impl/NewsColumnServiceImpl.java | 2
ycl-platform/src/main/resources/application.yml | 152 ++----
ycl-platform/src/main/resources/mapper/NewsPoliceDao.xml | 6
ycl-platform/src/main/java/com/ycl/mapper/NewsPoliceDao.java | 74 +-
ycl-platform/src/main/resources/mapper/NewsChannelDao.xml | 2
46 files changed, 732 insertions(+), 507 deletions(-)
diff --git a/.idea/easyCodeTableSetting.xml b/.idea/easyCodeTableSetting.xml
index 14479b1..95ad429 100644
--- a/.idea/easyCodeTableSetting.xml
+++ b/.idea/easyCodeTableSetting.xml
@@ -451,6 +451,50 @@
</TableInfoDTO>
</value>
</entry>
+ <entry key="news_website.news_information_police">
+ <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="璧勮id" />
+ <option name="custom" value="false" />
+ <option name="ext" value="{}" />
+ <option name="name" value="newsInformationId" />
+ <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="NewsInformationPolice" />
+ <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="MybatisPlus-Mixed" />
+ </TableInfoDTO>
+ </value>
+ </entry>
<entry key="news_website.news_ip">
<value>
<TableInfoDTO>
diff --git a/ycl-common/target/classes/META-INF/spring-configuration-metadata.json b/ycl-common/target/classes/META-INF/spring-configuration-metadata.json
deleted file mode 100644
index 3bbd884..0000000
--- a/ycl-common/target/classes/META-INF/spring-configuration-metadata.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "groups": [
- {
- "name": "secure.ignored",
- "type": "com.ycl.config.IgnoreUrlsConfig",
- "sourceType": "com.ycl.config.IgnoreUrlsConfig"
- }
- ],
- "properties": [
- {
- "name": "secure.ignored.urls",
- "type": "java.util.List<java.lang.String>",
- "sourceType": "com.ycl.config.IgnoreUrlsConfig"
- }
- ],
- "hints": []
-}
\ No newline at end of file
diff --git a/ycl-common/target/classes/mapper/depart/DepartManagerMapper.xml b/ycl-common/target/classes/mapper/depart/DepartManagerMapper.xml
deleted file mode 100644
index 167d2db..0000000
--- a/ycl-common/target/classes/mapper/depart/DepartManagerMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.mapper.depart.DepartManagerMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.depart.DepartManager">
- <id column="id" property="id" />
- <result column="user_id" property="userId" />
- <result column="depart_id" property="departId" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="is_leader" property="leader" />
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, user_id, depart_id, create_time, update_time, is_leader
- </sql>
-
-</mapper>
diff --git a/ycl-common/target/classes/mapper/depart/UmsDepartMapper.xml b/ycl-common/target/classes/mapper/depart/UmsDepartMapper.xml
deleted file mode 100644
index e2b5f47..0000000
--- a/ycl-common/target/classes/mapper/depart/UmsDepartMapper.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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.mapper.depart.UmsDepartMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.depart.UmsDepart">
- <id column="id" property="id"/>
- <result column="depart_name" property="departName"/>
- <result column="depart_des" property="departDes"/>
- <result column="depart_type" property="departType"/>
- <result column="parent_id" property="parentId"/>
- <result column="status" property="status"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <result column="is_deleted" property="isDeleted"/>
- </resultMap>
- <resultMap type="com.ycl.entity.depart.UmsDepart" id="UserDepartResultMap" extends="BaseResultMap">
- <collection property="userInfoDTOS" javaType="ArrayList" ofType="com.ycl.dto.user.DepartUserDTO">
- <id column="user_id" property="userId"/>
- <result column="username" property="username"/>
- </collection>
- </resultMap>
-
- <resultMap id="DepartVOMap" type="com.ycl.vo.depart.UmsDepartVO" extends="BaseResultMap">
- <result column="depart_type_name" property="departTypeName" jdbcType="VARCHAR"></result>
- <result column="p_depart_name" property="parentDepartName" jdbcType="VARCHAR"></result>
- <collection property="userInfoDTOS" javaType="ArrayList" ofType="com.ycl.dto.user.DepartUserDTO">
- <id column="user_id" property="userId"/>
- <result column="username" property="username"/>
- <result column="is_leader" property="leader" jdbcType="BOOLEAN"></result>
- </collection>
- </resultMap>
-
- <select id="selectDepartList" resultMap="UserDepartResultMap">
- SELECT ud.*,
- ua.id user_id,
- ua.username
- FROM ums_depart ud
- LEFT JOIN ums_depart_manager udm ON ud.id = udm.depart_id
- LEFT JOIN ums_admin ua ON udm.user_id = ua.id
- where ud.is_deleted = 0
- </select>
- <select id="selectPageByName" resultMap="DepartVOMap">
- SELECT t_0.*,
- ua.id user_id,
- ua.username,
- dd.`name` as depart_type_name,udm.is_leader,pd.depart_name as p_depart_name
- FROM (
- SELECT ud.*
- FROM ums_depart ud
- WHERE is_deleted = 0
- <if test="departName!=null and departName!=''">
- and ud.name like CONCAT('%',#{departName},'%')
- </if>
- ORDER BY ud.parent_id,ud.id desc
- LIMIT #{offset}, #{size}
- ) t_0
- LEFT JOIN ums_depart_manager udm ON t_0.id = udm.depart_id
- LEFT JOIN ums_admin ua ON udm.user_id = ua.id
- left join ums_data_dictionary as dd on t_0.depart_type = dd.id
- left join ums_depart as pd on t_0.parent_id = pd.id
- </select>
-
- <select id="selectSurplusUser" resultType="com.ycl.entity.user.UmsAdmin">
- SELECT
- t.id,
- t3.username
- FROM
- ( SELECT t1.id FROM ums_admin t1 UNION ALL SELECT t2.user_id FROM ums_depart_manager t2 ) t
- LEFT JOIN ums_admin t3 on t3.id =t.id
- GROUP BY
- id
- HAVING
- count( * )= 1
- </select>
-
- <select id="selectSurplusUserAndExistUser" resultType="com.ycl.entity.user.UmsAdmin" parameterType="java.lang.Long">
- SELECT
- t4.id,
- t4.username
- FROM
- ums_depart_manager t3
- LEFT JOIN ums_admin t4 ON t3.user_id = t4.id
- WHERE
- t3.depart_id = #{id} UNION ALL
- SELECT
- t.id,
- t3.username
- FROM
- ( SELECT t1.id FROM ums_admin t1 UNION ALL SELECT t2.user_id FROM ums_depart_manager t2 ) t
- LEFT JOIN ums_admin t3 ON t3.id = t.id
- GROUP BY
- id
- HAVING
- count( * )= 1
- </select>
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/AdminMenuRelationMapper.xml b/ycl-common/target/classes/mapper/user/AdminMenuRelationMapper.xml
deleted file mode 100644
index 7ee3aa9..0000000
--- a/ycl-common/target/classes/mapper/user/AdminMenuRelationMapper.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.mapper.user.AdminMenuRelationMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.AdminMenuRelation">
- <id column="id" property="id" />
- <result column="admin_id" property="adminId" />
- <result column="menu_id" property="menuId" />
- <result column="is_start" property="isStart" />
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, admin_id, menu_id, is_start
- </sql>
-
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/UmsAdminLoginLogMapper.xml b/ycl-common/target/classes/mapper/user/UmsAdminLoginLogMapper.xml
deleted file mode 100644
index 1f5a1fd..0000000
--- a/ycl-common/target/classes/mapper/user/UmsAdminLoginLogMapper.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.mapper.user.UmsAdminLoginLogMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminLoginLog">
- <id column="id" property="id"/>
- <result column="admin_id" property="adminId"/>
- <result column="create_time" property="createTime"/>
- <result column="ip" property="ip"/>
- <result column="address" property="address"/>
- <result column="user_agent" property="userAgent"/>
- </resultMap>
- <select id="selectByCondition" parameterType="com.ycl.dto.log.LogQueryParams"
- resultType="com.ycl.entity.user.vo.UmsAdminLogVO">
- SELECT t1.*,t2.username as adminId FROM ums_admin_login_log t1
- left join ums_admin t2 on t1.admin_id=t2.id
- <where>
- <if test="logQueryParams.content!='' and logQueryParams.content!=null">
- contain LIKE CONCAT('%',#{logQueryParams.content},'%')
- </if>
- <if test="logQueryParams.operationType!='' and logQueryParams.operationType!=null">
- and operation_type=#{logQueryParams.operationType}
- </if>
- <if test="logQueryParams.portEquipment!='' and logQueryParams.portEquipment!=null">
- and user_agent=#{logQueryParams.portEquipment}
- </if>
- <if test="logQueryParams.id != null">
- and admin_id=#{logQueryParams.id}
- </if>
- <if test="logQueryParams.startTime != '' and logQueryParams.endTime !='' and logQueryParams.startTime !=null and logQueryParams.endTime!=null ">
- and create_time BETWEEN #{logQueryParams.startTime} AND #{logQueryParams.endTime}
- </if>
- </where>
- <if test="logQueryParams.sort != null and logQueryParams.sort == 1">
- ORDER BY create_time desc
- </if>
- <if test="logQueryParams.sort != null and logQueryParams.sort == 0">
- ORDER BY create_time asc
- </if>
- </select>
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/UmsAdminMapper.xml b/ycl-common/target/classes/mapper/user/UmsAdminMapper.xml
deleted file mode 100644
index 78369f0..0000000
--- a/ycl-common/target/classes/mapper/user/UmsAdminMapper.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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.mapper.user.UmsAdminMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdmin">
- <id column="id" property="id"/>
- <result column="username" property="username"/>
- <result column="password" property="password"/>
- <result column="icon" property="icon"/>
- <result column="email" property="email"/>
- <result column="nick_name" property="nickName"/>
- <result column="sex" property="sex"/>
- <result column="note" property="note"/>
- <result column="create_time" property="createTime"/>
- <result column="login_time" property="loginTime"/>
- <result column="status" property="status"/>
- <result column="mac_address" property="macAddress"/>
- <result column="ip_address" property="ipAddress"/>
- <result column="is_dy" property="isDy"/>
- <result column="job_title" property="jobTitle"/>
- <result column="user_type" property="userType"/>
- <result column="zj" property="zj"/>
- <result column="mobile" property="mobile"/>
- </resultMap>
- <resultMap type="com.ycl.entity.user.UmsAdmin" id="CondMapResultMap" extends="BaseResultMap">
- <collection property="depart" javaType="ArrayList" ofType="com.ycl.entity.depart.UmsDepart">
- <id column="depart_id" property="id"/>
- <result column="depart_name" property="departName"/>
- <result column="depart_des" property="departDes"/>
- <result column="depart_type" property="departType"/>
- <result column="parent_id" property="parentId"/>
- <result column="depart_status" property="status"/>
- <result column="depart_create_time" property="createTime"/>
- <result column="depart_update_time" property="updateTime"/>
- <result column="is_deleted" property="isDeleted"/>
- </collection>
- <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole" column="id"
- select="selectAdminRoles">
- <id column="role_id" property="id"/>
- <result column="name" property="name"/>
- <result column="description" property="description"/>
- <result column="admin_count" property="adminCount"/>
- <result column="role_create_time" property="createTime"/>
- <result column="role_status" property="status"/>
- <result column="sort" property="sort"/>
- </collection>
- </resultMap>
-
- <select id="getAdminIdList" resultType="java.lang.Long">
- SELECT DISTINCT ar.admin_id
- FROM ums_role_resource_relation rr
- LEFT JOIN ums_admin_role_relation ar ON rr.role_id = ar.role_id
- WHERE rr.resource_id = #{resourceId}
- </select>
-
- <select id="selectCondPage" parameterType="com.ycl.entity.user.UmsAdmin" resultMap="CondMapResultMap">
- SELECT
- ua.*,
- ud.id depart_id,
- ud.depart_name,
- ud.depart_des,
- ud.depart_type,
- ud.parent_id,
- ud.create_time depat_create_time,
- ud.update_time depat_update_time,
- ud.STATUS depart_status,
- ud.is_deleted
- FROM
- ums_admin ua
- LEFT JOIN ums_depart_manager udm ON ua.id = udm.user_id
- LEFT JOIN ums_depart ud ON udm.depart_id = ud.id
- <where>
- <if test="umsAdmin.keyword !=null and umsAdmin.keyword !=''">
- AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
- or ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
- or ua.mobile LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%'))
- </if>
- <if test="umsAdmin.userType !=null and umsAdmin.userType >=0 ">
- AND ua.user_type = #{umsAdmin.userType}
- </if>
- <if test="umsAdmin.jobTitle !=null and umsAdmin.keyword !=''">
- AND ua.job_title = #{umsAdmin.jobTitle}
- </if>
- </where>
- ORDER BY
- ua.id DESC
- </select>
- <select id="selectAdminRoles" parameterType="java.lang.Long" resultType="com.ycl.entity.user.UmsRole">
- select ur.id role_id,
- ur.name NAME,
- ur.description,
- ur.admin_count,
- ur.create_time role_create_time,
- ur.STATUS role_status,
- ur.sort
- from ums_admin ua
- LEFT JOIN ums_admin_role_relation uarr ON ua.id = uarr.admin_id
- left join ums_role ur on uarr.role_id = ur.id
- where ua.id = #{id}
- </select>
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/UmsAdminRoleRelationMapper.xml b/ycl-common/target/classes/mapper/user/UmsAdminRoleRelationMapper.xml
deleted file mode 100644
index fc81f7e..0000000
--- a/ycl-common/target/classes/mapper/user/UmsAdminRoleRelationMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.mapper.user.UmsAdminRoleRelationMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminRoleRelation">
- <id column="id" property="id"/>
- <result column="admin_id" property="adminId"/>
- <result column="role_id" property="roleId"/>
- </resultMap>
-
- <select id="selectPermissionById" parameterType="java.lang.Long" resultType="java.lang.String">
- SELECT t3.`name`
- FROM `ums_admin_role_relation` AS t1
- JOIN ums_role t2 on t1.role_id = t2.id
- JOIN ums_data_dictionary t3 ON t2.type = t3.id
- WHERE t1.admin_id = #{id}
- </select>
-
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/UmsDepartManageMapper.xml b/ycl-common/target/classes/mapper/user/UmsDepartManageMapper.xml
deleted file mode 100644
index 932ebc0..0000000
--- a/ycl-common/target/classes/mapper/user/UmsDepartManageMapper.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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.mapper.user.UmsDepartManageMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsDepartManage">
- <id column="id" property="id"/>
- <result column="user_id" property="userId"/>
- <result column="depart_id" property="departId"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id
- , user_id,depart_id,create_time,update_time
- </sql>
-
- <delete id="deletedByDepartId">
- delete
- from ums_depart_manager
- where depart_id = #{departId}
- </delete>
-
- <select id="selectPageByUserId" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from ums_depart_manager
- where user_id=#{userId}
- limit #{current},#{pageSize}
- </select>
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/UmsMenuMapper.xml b/ycl-common/target/classes/mapper/user/UmsMenuMapper.xml
deleted file mode 100644
index cccc442..0000000
--- a/ycl-common/target/classes/mapper/user/UmsMenuMapper.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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.mapper.user.UmsMenuMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsMenu">
- <id column="id" property="id"/>
- <result column="parent_id" property="parentId"/>
- <result column="create_time" property="createTime"/>
- <result column="title" property="title"/>
- <result column="level" property="level"/>
- <result column="sort" property="sort"/>
- <result column="name" property="name"/>
- <result column="icon" property="icon"/>
- <result column="hidden" property="hidden"/>
- </resultMap>
-
- <select id="getMenuList" resultType="com.ycl.entity.user.UmsMenu">
- SELECT distinct m.id,
- m.parent_id parentId,
- m.create_time createTime,
- m.title,
- m.url,
- m.level,
- m.sort,
- m.name,
- m.icon,
- m.hidden
- FROM ums_admin_role_relation arr
- LEFT JOIN ums_role r ON arr.role_id = r.id
- LEFT JOIN ums_role_menu_relation rmr ON r.id = rmr.role_id
- LEFT JOIN ums_menu m ON rmr.menu_id = m.id
- WHERE arr.admin_id = #{adminId}
- AND m.id IS NOT NULL
- Order BY m.`level`, m.sort
- </select>
- <select id="getMenuListByRoleId" resultType="com.ycl.entity.user.UmsMenu">
- SELECT m.id id,
- m.parent_id parentId,
- m.create_time createTime,
- m.title title,
- m.level level,
- m.sort sort,
- m.name name,
- m.icon icon,
- m.hidden hidden
- FROM ums_role_menu_relation rmr
- LEFT JOIN ums_menu m ON rmr.menu_id = m.id and m.leaf = 1
- WHERE rmr.role_id = #{roleId}
- AND m.id IS NOT NULL
- GROUP BY m.id
- </select>
-
- <select id="adminMenuRelation" resultType="com.ycl.entity.user.vo.UmsMenuVo">
- SELECT amr.id AS relationId,
- amr.is_start AS isStart,
- amr.sort,
- m.id,
- m.parent_id AS parentId,
- m.title,
- m.url,
- m.`level`,
- m.description,
- m.create_time as createTime,
- m.hidden,
- m.icon
- FROM `ums_admin_menu_relation` AS amr
- JOIN ums_menu AS m ON amr.menu_id = m.id
- WHERE amr.admin_id = #{id}
- </select>
-
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/UmsResourceCategoryMapper.xml b/ycl-common/target/classes/mapper/user/UmsResourceCategoryMapper.xml
deleted file mode 100644
index 6bd167e..0000000
--- a/ycl-common/target/classes/mapper/user/UmsResourceCategoryMapper.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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.mapper.user.UmsResourceCategoryMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsResourceCategory">
- <id column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="name" property="name" />
- <result column="sort" property="sort" />
- </resultMap>
-
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/UmsResourceMapper.xml b/ycl-common/target/classes/mapper/user/UmsResourceMapper.xml
deleted file mode 100644
index ce97928..0000000
--- a/ycl-common/target/classes/mapper/user/UmsResourceMapper.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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.mapper.user.UmsResourceMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsResource">
- <id column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="name" property="name" />
- <result column="url" property="url" />
- <result column="description" property="description" />
- <result column="category_id" property="categoryId" />
- </resultMap>
-
- <select id="getResourceList" resultType="com.ycl.entity.user.UmsResource">
- SELECT
- ur.id id,
- ur.create_time createTime,
- ur.`name` `name`,
- ur.url url,
- ur.description description,
- ur.category_id categoryId
- FROM
- ums_admin_role_relation ar
- LEFT JOIN ums_role r ON ar.role_id = r.id
- LEFT JOIN ums_role_resource_relation rrr ON r.id = rrr.role_id
- LEFT JOIN ums_resource ur ON ur.id = rrr.resource_id
- WHERE
- ar.admin_id = #{adminId}
- AND ur.id IS NOT NULL
- GROUP BY
- ur.id
- </select>
-
- <select id="getResourceListByRoleId" resultType="com.ycl.entity.user.UmsResource">
- SELECT
- r.id id,
- r.create_time createTime,
- r.`name` `name`,
- r.url url,
- r.description description,
- r.category_id categoryId
- FROM
- ums_role_resource_relation rrr
- LEFT JOIN ums_resource r ON rrr.resource_id = r.id
- WHERE
- rrr.role_id = #{roleId}
- AND r.id IS NOT NULL
- GROUP BY
- r.id
- </select>
-
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/UmsRoleMapper.xml b/ycl-common/target/classes/mapper/user/UmsRoleMapper.xml
deleted file mode 100644
index dae0a5a..0000000
--- a/ycl-common/target/classes/mapper/user/UmsRoleMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.mapper.user.UmsRoleMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRole">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="description" property="description" />
- <result column="admin_count" property="adminCount" />
- <result column="create_time" property="createTime" />
- <result column="status" property="status" />
- <result column="sort" property="sort" />
- </resultMap>
-
- <select id="getRoleList" resultType="com.ycl.entity.user.UmsRole">
- select r.*
- from ums_admin_role_relation ar left join ums_role r on ar.role_id = r.id
- where ar.admin_id = #{adminId}
- </select>
-
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/UmsRoleMenuRelationMapper.xml b/ycl-common/target/classes/mapper/user/UmsRoleMenuRelationMapper.xml
deleted file mode 100644
index 6d8268c..0000000
--- a/ycl-common/target/classes/mapper/user/UmsRoleMenuRelationMapper.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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.mapper.user.UmsRoleMenuRelationMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRoleMenuRelation">
- <id column="id" property="id" />
- <result column="role_id" property="roleId" />
- <result column="menu_id" property="menuId" />
- </resultMap>
-
-</mapper>
diff --git a/ycl-common/target/classes/mapper/user/UmsRoleResourceRelationMapper.xml b/ycl-common/target/classes/mapper/user/UmsRoleResourceRelationMapper.xml
deleted file mode 100644
index 3013849..0000000
--- a/ycl-common/target/classes/mapper/user/UmsRoleResourceRelationMapper.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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.mapper.user.UmsRoleResourceRelationMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsRoleResourceRelation">
- <id column="id" property="id" />
- <result column="role_id" property="roleId" />
- <result column="resource_id" property="resourceId" />
- </resultMap>
-</mapper>
diff --git a/ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentInformationController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentInformationController.java
deleted file mode 100644
index ba5b87c..0000000
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsDepartmentInformationController.java
+++ /dev/null
@@ -1,88 +0,0 @@
-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/NewsInformationPoliceController.java b/ycl-platform/src/main/java/com/ycl/controller/NewsInformationPoliceController.java
new file mode 100644
index 0000000..ca6d89f
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsInformationPoliceController.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.NewsInformationPolice;
+import com.ycl.service.NewsInformationPoliceService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 璧勮璀﹀憳涓棿琛�(NewsInformationPolice)琛ㄦ帶鍒跺眰
+ *
+ * @author makejava
+ * @since 2022-11-17 15:17:21
+ */
+@RestController
+@RequestMapping("newsInformationPolice")
+public class NewsInformationPoliceController extends ApiController {
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
+ @Resource
+ private NewsInformationPoliceService newsInformationPoliceService;
+
+ /**
+ * 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
+ *
+ * @param page 鍒嗛〉瀵硅薄
+ * @param newsInformationPolice 鏌ヨ瀹炰綋
+ * @return 鎵�鏈夋暟鎹�
+ */
+ @GetMapping
+ public R selectAll(Page<NewsInformationPolice> page, NewsInformationPolice newsInformationPolice) {
+ return success(this.newsInformationPoliceService.page(page, new QueryWrapper<>(newsInformationPolice)));
+ }
+
+ /**
+ * 閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁
+ *
+ * @param id 涓婚敭
+ * @return 鍗曟潯鏁版嵁
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable Serializable id) {
+ return success(this.newsInformationPoliceService.getById(id));
+ }
+
+ /**
+ * 鏂板鏁版嵁
+ *
+ * @param newsInformationPolice 瀹炰綋瀵硅薄
+ * @return 鏂板缁撴灉
+ */
+ @PostMapping
+ public R insert(@RequestBody NewsInformationPolice newsInformationPolice) {
+ return success(this.newsInformationPoliceService.save(newsInformationPolice));
+ }
+
+ /**
+ * 淇敼鏁版嵁
+ *
+ * @param newsInformationPolice 瀹炰綋瀵硅薄
+ * @return 淇敼缁撴灉
+ */
+ @PutMapping
+ public R update(@RequestBody NewsInformationPolice newsInformationPolice) {
+ return success(this.newsInformationPoliceService.updateById(newsInformationPolice));
+ }
+
+ /**
+ * 鍒犻櫎鏁版嵁
+ *
+ * @param idList 涓婚敭缁撳悎
+ * @return 鍒犻櫎缁撴灉
+ */
+ @DeleteMapping
+ public R delete(@RequestParam("idList") List<Long> idList) {
+ return success(this.newsInformationPoliceService.removeByIds(idList));
+ }
+}
+
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 c0cd728..6c8d759 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/NewsPoliceController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/NewsPoliceController.java
@@ -7,11 +7,15 @@
import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.NewsPolice;
+import com.ycl.service.NewsAdminService;
import com.ycl.service.NewsPoliceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
+import java.sql.SQLException;
import java.util.List;
/**
@@ -29,6 +33,9 @@
*/
@Resource
private NewsPoliceService newsPoliceService;
+
+ @Autowired
+ private NewsAdminService newsAdminService;
/**
* 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
@@ -59,9 +66,11 @@
* @param newsPolice 瀹炰綋瀵硅薄
* @return 鏂板缁撴灉
*/
+ @Transactional(rollbackFor = SQLException.class)
@PostMapping
public R insert(@RequestBody NewsPolice newsPolice) {
- return success(this.newsPoliceService.save(newsPolice));
+ this.newsPoliceService.save(newsPolice);
+ return success(newsAdminService.autoCreateAdmin(newsPolice));
}
/**
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsChannelColumnDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsChannelColumnDao.java
deleted file mode 100644
index 585165a..0000000
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsChannelColumnDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-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.NewsChannelColumn;
-
-/**
- * 棰戦亾鏍忕洰涓棿琛�(NewsChannelColumn)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-17 11:38:27
- */
-public interface NewsChannelColumnDao extends BaseMapper<NewsChannelColumn> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsChannelColumn> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsChannelColumn> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsChannelColumn> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsChannelColumn> entities);
-
-}
-
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsChannelDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsChannelDao.java
deleted file mode 100644
index e4774d6..0000000
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsChannelDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-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.NewsChannel;
-
-/**
- * 棰戦亾琛�(NewsChannel)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-17 11:38:27
- */
-public interface NewsChannelDao extends BaseMapper<NewsChannel> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsChannel> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsChannel> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsChannel> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsChannel> entities);
-
-}
-
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsColumnDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsColumnDao.java
deleted file mode 100644
index 3a41ec9..0000000
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsColumnDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-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.NewsColumn;
-
-/**
- * 鏍忕洰琛�(NewsColumn)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-17 11:38:27
- */
-public interface NewsColumnDao extends BaseMapper<NewsColumn> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsColumn> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsColumn> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsColumn> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsColumn> entities);
-
-}
-
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsColumnInformationDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsColumnInformationDao.java
deleted file mode 100644
index aafb5c6..0000000
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsColumnInformationDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-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.NewsColumnInformation;
-
-/**
- * 鏍忕洰鍜ㄨ涓棿琛�(NewsColumnInformation)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-17 11:38:27
- */
-public interface NewsColumnInformationDao extends BaseMapper<NewsColumnInformation> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsColumnInformation> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsColumnInformation> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsColumnInformation> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsColumnInformation> entities);
-
-}
-
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentInformationDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentInformationDao.java
deleted file mode 100644
index f065029..0000000
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentInformationDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index 14ddeb3..0000000
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsDutyDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-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.NewsDuty;
-
-/**
- * 鍊肩彮琛�(NewsDuty)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-17 11:38:27
- */
-public interface NewsDutyDao extends BaseMapper<NewsDuty> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsDuty> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsDuty> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsDuty> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsDuty> entities);
-
-}
-
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsInformationDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsInformationDao.java
deleted file mode 100644
index 7b009ed..0000000
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsInformationDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-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.NewsInformation;
-
-/**
- * 璧勮琛�(NewsInformation)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-17 11:38:27
- */
-public interface NewsInformationDao extends BaseMapper<NewsInformation> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsInformation> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsInformation> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsInformation> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsInformation> entities);
-
-}
-
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsInformationPoliceDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsInformationPoliceDao.java
new file mode 100644
index 0000000..0d879b5
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/dao/NewsInformationPoliceDao.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.NewsInformationPolice;
+
+/**
+ * 璧勮璀﹀憳涓棿琛�(NewsInformationPolice)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2022-11-17 15:17:21
+ */
+public interface NewsInformationPoliceDao extends BaseMapper<NewsInformationPolice> {
+
+/**
+* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsInformationPolice> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+*/
+int insertBatch(@Param("entities") List<NewsInformationPolice> entities);
+
+/**
+* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsInformationPolice> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
+*/
+int insertOrUpdateBatch(@Param("entities") List<NewsInformationPolice> entities);
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsIpDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsIpDao.java
deleted file mode 100644
index 06cfd6c..0000000
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsIpDao.java
+++ /dev/null
@@ -1,35 +0,0 @@
-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.NewsIp;
-
-/**
- * ip鐧藉悕鍗曡〃(NewsIp)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-17 11:38:27
- */
-public interface NewsIpDao extends BaseMapper<NewsIp> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsIp> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsIp> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsIp> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsIp> entities);
-
-}
-
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsPoliceDao.java b/ycl-platform/src/main/java/com/ycl/dao/NewsPoliceDao.java
deleted file mode 100644
index 2c0f863..0000000
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsPoliceDao.java
+++ /dev/null
@@ -1,36 +0,0 @@
-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.NewsPolice;
-
-/**
- * 璀﹀憳琛�
-(NewsPolice)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-17 11:38:27
- */
-public interface NewsPoliceDao extends BaseMapper<NewsPolice> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsPolice> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsPolice> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsPolice> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsPolice> entities);
-
-}
-
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 3fdb2f7..483902a 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsAdmin.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsAdmin.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.activerecord.Model;
import java.io.Serializable;
-import java.sql.Date;
+import java.util.Date;
/**
* 鍚庡彴鐢ㄦ埛琛�(NewsAdmin)琛ㄥ疄浣撶被
diff --git a/ycl-platform/src/main/java/com/ycl/entity/NewsDepartmentInformation.java b/ycl-platform/src/main/java/com/ycl/entity/NewsInformationPolice.java
similarity index 68%
rename from ycl-platform/src/main/java/com/ycl/entity/NewsDepartmentInformation.java
rename to ycl-platform/src/main/java/com/ycl/entity/NewsInformationPolice.java
index 1d97e7e..d1900c0 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsDepartmentInformation.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsInformationPolice.java
@@ -5,17 +5,17 @@
import java.io.Serializable;
/**
- * 鏈烘瀯锛堥儴闂級涓棿琛�(NewsDepartmentInformation)琛ㄥ疄浣撶被
+ * 璧勮璀﹀憳涓棿琛�(NewsInformationPolice)琛ㄥ疄浣撶被
*
* @author makejava
- * @since 2022-11-17 11:38:27
+ * @since 2022-11-17 15:17:21
*/
@SuppressWarnings("serial")
-public class NewsDepartmentInformation extends Model<NewsDepartmentInformation> {
+public class NewsInformationPolice extends Model<NewsInformationPolice> {
private Integer id;
- //鏈烘瀯锛堥儴闂╥d锛�
- private Integer newsDepartmentId;
+ //璧勮id
+ private Integer newsInformationId;
//璀﹀憳id
private Integer newsPoliceId;
//鏄惁绛炬敹0鏈鏀�1绛炬敹2涓嶉渶瑕佺鏀�
@@ -30,12 +30,12 @@
this.id = id;
}
- public Integer getNewsDepartmentId() {
- return newsDepartmentId;
+ public Integer getNewsInformationId() {
+ return newsInformationId;
}
- public void setNewsDepartmentId(Integer newsDepartmentId) {
- this.newsDepartmentId = newsDepartmentId;
+ public void setNewsInformationId(Integer newsInformationId) {
+ this.newsInformationId = newsInformationId;
}
public Integer getNewsPoliceId() {
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 03ca160..76c16e4 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/NewsPolice.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/NewsPolice.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.io.Serializable;
import java.sql.Date;
@@ -19,7 +21,9 @@
//璀﹀憳鍚嶇О
private String rname;
//鍒涘缓鏃堕棿
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
//淇敼鏃堕棿
private Date updateTime;
//鏈烘瀯id
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsAdminDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsAdminDao.java
similarity index 97%
rename from ycl-platform/src/main/java/com/ycl/dao/NewsAdminDao.java
rename to ycl-platform/src/main/java/com/ycl/mapper/NewsAdminDao.java
index 12c327e..1862bc0 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsAdminDao.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsAdminDao.java
@@ -1,4 +1,4 @@
-package com.ycl.dao;
+package com.ycl.mapper;
import java.util.List;
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/NewsChannelColumnDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsChannelColumnDao.java
index 1d7cc5c..28c55cf 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/NewsChannelColumnDao.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsChannelColumnDao.java
@@ -1,35 +1,35 @@
-package com.ycl.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import com.ycl.entity.NewsChannelColumn;
-
-/**
- * 棰戦亾鏍忕洰涓棿琛�(NewsChannelColumn)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-16 16:52:30
- */
-public interface NewsChannelColumnDao extends BaseMapper<NewsChannelColumn> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsChannelColumn> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsChannelColumn> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsChannelColumn> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsChannelColumn> entities);
-
-}
-
+package com.ycl.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.ycl.entity.NewsChannelColumn;
+
+/**
+ * 棰戦亾鏍忕洰涓棿琛�(NewsChannelColumn)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+public interface NewsChannelColumnDao extends BaseMapper<NewsChannelColumn> {
+
+/**
+* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsChannelColumn> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+*/
+int insertBatch(@Param("entities") List<NewsChannelColumn> entities);
+
+/**
+* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsChannelColumn> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
+*/
+int insertOrUpdateBatch(@Param("entities") List<NewsChannelColumn> entities);
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/NewsChannelDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsChannelDao.java
index 2487090..007e4df 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/NewsChannelDao.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsChannelDao.java
@@ -1,35 +1,35 @@
-package com.ycl.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import com.ycl.entity.NewsChannel;
-
-/**
- * 棰戦亾琛�(NewsChannel)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-16 16:52:30
- */
-public interface NewsChannelDao extends BaseMapper<NewsChannel> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsChannel> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsChannel> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsChannel> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsChannel> entities);
-
-}
-
+package com.ycl.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.ycl.entity.NewsChannel;
+
+/**
+ * 棰戦亾琛�(NewsChannel)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+public interface NewsChannelDao extends BaseMapper<NewsChannel> {
+
+/**
+* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsChannel> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+*/
+int insertBatch(@Param("entities") List<NewsChannel> entities);
+
+/**
+* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsChannel> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
+*/
+int insertOrUpdateBatch(@Param("entities") List<NewsChannel> entities);
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/NewsColumnDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsColumnDao.java
index 76953d8..10717fc 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/NewsColumnDao.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsColumnDao.java
@@ -1,35 +1,35 @@
-package com.ycl.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import com.ycl.entity.NewsColumn;
-
-/**
- * 鏍忕洰琛�(NewsColumn)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-16 16:52:30
- */
-public interface NewsColumnDao extends BaseMapper<NewsColumn> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsColumn> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsColumn> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsColumn> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsColumn> entities);
-
-}
-
+package com.ycl.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.ycl.entity.NewsColumn;
+
+/**
+ * 鏍忕洰琛�(NewsColumn)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+public interface NewsColumnDao extends BaseMapper<NewsColumn> {
+
+/**
+* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsColumn> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+*/
+int insertBatch(@Param("entities") List<NewsColumn> entities);
+
+/**
+* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsColumn> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
+*/
+int insertOrUpdateBatch(@Param("entities") List<NewsColumn> entities);
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/NewsColumnInformationDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsColumnInformationDao.java
index 45799a2..9d9ec83 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/NewsColumnInformationDao.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsColumnInformationDao.java
@@ -1,35 +1,35 @@
-package com.ycl.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import com.ycl.entity.NewsColumnInformation;
-
-/**
- * 鏍忕洰棰戦亾涓棿琛�(NewsColumnInformation)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-16 16:52:30
- */
-public interface NewsColumnInformationDao extends BaseMapper<NewsColumnInformation> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsColumnInformation> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsColumnInformation> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsColumnInformation> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsColumnInformation> entities);
-
-}
-
+package com.ycl.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.ycl.entity.NewsColumnInformation;
+
+/**
+ * 鏍忕洰鍜ㄨ涓棿琛�(NewsColumnInformation)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+public interface NewsColumnInformationDao extends BaseMapper<NewsColumnInformation> {
+
+/**
+* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsColumnInformation> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+*/
+int insertBatch(@Param("entities") List<NewsColumnInformation> entities);
+
+/**
+* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsColumnInformation> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
+*/
+int insertOrUpdateBatch(@Param("entities") List<NewsColumnInformation> entities);
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsDepartmentDao.java
similarity index 97%
rename from ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentDao.java
rename to ycl-platform/src/main/java/com/ycl/mapper/NewsDepartmentDao.java
index 5ea9059..855fd34 100644
--- a/ycl-platform/src/main/java/com/ycl/dao/NewsDepartmentDao.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsDepartmentDao.java
@@ -1,4 +1,4 @@
-package com.ycl.dao;
+package com.ycl.mapper;
import java.util.List;
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/NewsDutyDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsDutyDao.java
index e6b90a2..196b1fe 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/NewsDutyDao.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsDutyDao.java
@@ -1,35 +1,35 @@
-package com.ycl.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import com.ycl.entity.NewsDuty;
-
-/**
- * 鍊肩彮琛�(NewsDuty)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-16 16:52:30
- */
-public interface NewsDutyDao extends BaseMapper<NewsDuty> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsDuty> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsDuty> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsDuty> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsDuty> entities);
-
-}
-
+package com.ycl.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.ycl.entity.NewsDuty;
+
+/**
+ * 鍊肩彮琛�(NewsDuty)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+public interface NewsDutyDao extends BaseMapper<NewsDuty> {
+
+/**
+* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsDuty> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+*/
+int insertBatch(@Param("entities") List<NewsDuty> entities);
+
+/**
+* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsDuty> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
+*/
+int insertOrUpdateBatch(@Param("entities") List<NewsDuty> entities);
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/NewsInformationDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsInformationDao.java
index 948d853..45a88cc 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/NewsInformationDao.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsInformationDao.java
@@ -1,35 +1,35 @@
-package com.ycl.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import com.ycl.entity.NewsInformation;
-
-/**
- * 鍜ㄨ琛�(NewsInformation)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-16 16:52:30
- */
-public interface NewsInformationDao extends BaseMapper<NewsInformation> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsInformation> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsInformation> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsInformation> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsInformation> entities);
-
-}
-
+package com.ycl.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.ycl.entity.NewsInformation;
+
+/**
+ * 璧勮琛�(NewsInformation)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+public interface NewsInformationDao extends BaseMapper<NewsInformation> {
+
+/**
+* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsInformation> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+*/
+int insertBatch(@Param("entities") List<NewsInformation> entities);
+
+/**
+* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsInformation> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
+*/
+int insertOrUpdateBatch(@Param("entities") List<NewsInformation> entities);
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/NewsIpDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsIpDao.java
index 8d5354f..74a316f 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/NewsIpDao.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsIpDao.java
@@ -1,35 +1,35 @@
-package com.ycl.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import com.ycl.entity.NewsIp;
-
-/**
- * ip鐧藉悕鍗曡〃(NewsIp)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-16 16:52:30
- */
-public interface NewsIpDao extends BaseMapper<NewsIp> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsIp> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsIp> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsIp> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsIp> entities);
-
-}
-
+package com.ycl.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.ycl.entity.NewsIp;
+
+/**
+ * ip鐧藉悕鍗曡〃(NewsIp)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+public interface NewsIpDao extends BaseMapper<NewsIp> {
+
+/**
+* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsIp> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+*/
+int insertBatch(@Param("entities") List<NewsIp> entities);
+
+/**
+* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsIp> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
+*/
+int insertOrUpdateBatch(@Param("entities") List<NewsIp> entities);
+
+}
+
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/NewsPoliceDao.java b/ycl-platform/src/main/java/com/ycl/mapper/NewsPoliceDao.java
index 66e270c..460fd53 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/NewsPoliceDao.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/NewsPoliceDao.java
@@ -1,36 +1,38 @@
-package com.ycl.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import com.ycl.entity.NewsPolice;
-
-/**
- * 璀﹀憳琛�
-(NewsPolice)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author makejava
- * @since 2022-11-16 16:52:30
- */
-public interface NewsPoliceDao extends BaseMapper<NewsPolice> {
-
-/**
-* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsPolice> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-*/
-int insertBatch(@Param("entities") List<NewsPolice> entities);
-
-/**
-* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
-*
-* @param entities List<NewsPolice> 瀹炰緥瀵硅薄鍒楄〃
-* @return 褰卞搷琛屾暟
-* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
-*/
-int insertOrUpdateBatch(@Param("entities") List<NewsPolice> entities);
-
-}
-
+package com.ycl.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import com.ycl.entity.NewsPolice;
+
+/**
+ * 璀﹀憳琛�
+(NewsPolice)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2022-11-17 11:38:27
+ */
+public interface NewsPoliceDao extends BaseMapper<NewsPolice> {
+
+/**
+* 鎵归噺鏂板鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsPolice> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+*/
+int insertBatch(@Param("entities") List<NewsPolice> entities);
+
+/**
+* 鎵归噺鏂板鎴栨寜涓婚敭鏇存柊鏁版嵁锛圡yBatis鍘熺敓foreach鏂规硶锛�
+*
+* @param entities List<NewsPolice> 瀹炰緥瀵硅薄鍒楄〃
+* @return 褰卞搷琛屾暟
+* @throws org.springframework.jdbc.BadSqlGrammarException 鍏ュ弬鏄┖List鐨勬椂鍊欎細鎶汼QL璇彞閿欒鐨勫紓甯革紝璇疯嚜琛屾牎楠屽叆鍙�
+*/
+int insertOrUpdateBatch(@Param("entities") List<NewsPolice> entities);
+
+NewsPolice savePolice(@Param("entity") NewsPolice entity);
+
+}
+
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 a35b941..b8021ac 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsAdminService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsAdminService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.NewsAdmin;
+import com.ycl.entity.NewsPolice;
/**
* 鍚庡彴鐢ㄦ埛琛�(NewsAdmin)琛ㄦ湇鍔℃帴鍙�
@@ -10,6 +11,6 @@
* @since 2022-11-17 11:38:27
*/
public interface NewsAdminService extends IService<NewsAdmin> {
-
+ Integer autoCreateAdmin(NewsPolice newsPolice);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/NewsDepartmentInformationService.java b/ycl-platform/src/main/java/com/ycl/service/NewsDepartmentInformationService.java
deleted file mode 100644
index 282cfb9..0000000
--- a/ycl-platform/src/main/java/com/ycl/service/NewsDepartmentInformationService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-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/NewsInformationPoliceService.java b/ycl-platform/src/main/java/com/ycl/service/NewsInformationPoliceService.java
new file mode 100644
index 0000000..2230777
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsInformationPoliceService.java
@@ -0,0 +1,15 @@
+package com.ycl.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.NewsInformationPolice;
+
+/**
+ * 璧勮璀﹀憳涓棿琛�(NewsInformationPolice)琛ㄦ湇鍔℃帴鍙�
+ *
+ * @author makejava
+ * @since 2022-11-17 15:17:22
+ */
+public interface NewsInformationPoliceService extends IService<NewsInformationPolice> {
+
+}
+
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 2f73812..ad49a2e 100644
--- a/ycl-platform/src/main/java/com/ycl/service/NewsPoliceService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/NewsPoliceService.java
@@ -11,6 +11,6 @@
* @since 2022-11-17 11:38:27
*/
public interface NewsPoliceService extends IService<NewsPolice> {
-
+ NewsPolice savePolice(NewsPolice 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 3bd4782..5d4aaf2 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
@@ -1,10 +1,17 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.dao.NewsAdminDao;
+import com.ycl.mapper.NewsAdminDao;
import com.ycl.entity.NewsAdmin;
+import com.ycl.entity.NewsPolice;
import com.ycl.service.NewsAdminService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.sql.SQLException;
+import java.util.Date;
/**
* 鍚庡彴鐢ㄦ埛琛�(NewsAdmin)琛ㄦ湇鍔″疄鐜扮被
@@ -15,5 +22,22 @@
@Service("newsAdminService")
public class NewsAdminServiceImpl extends ServiceImpl<NewsAdminDao, NewsAdmin> implements NewsAdminService {
+ @Autowired
+ private NewsAdminDao newsAdminDao;
+
+ @Value("${admin.defaultPassword}")
+ private String defaultPassword;
+
+ @Transactional(rollbackFor = SQLException.class)
+ @Override
+ public Integer autoCreateAdmin(NewsPolice newsPolice) {
+ NewsAdmin admin = new NewsAdmin();
+ admin.setUsername(newsPolice.getRname());
+ admin.setPassword(defaultPassword);
+ admin.setCreateTime(new Date());
+ admin.setStatus(1);
+ admin.setNewsPoliceId(newsPolice.getId());
+ return newsAdminDao.insert(admin);
+ }
}
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 551481a..9a78ab7 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
@@ -1,7 +1,7 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.dao.NewsChannelColumnDao;
+import com.ycl.mapper.NewsChannelColumnDao;
import com.ycl.entity.NewsChannelColumn;
import com.ycl.service.NewsChannelColumnService;
import org.springframework.stereotype.Service;
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 b08da6e..4577571 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
@@ -1,7 +1,7 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.dao.NewsChannelDao;
+import com.ycl.mapper.NewsChannelDao;
import com.ycl.entity.NewsChannel;
import com.ycl.service.NewsChannelService;
import org.springframework.stereotype.Service;
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 eeeb3ad..ccda044 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
@@ -1,7 +1,7 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.dao.NewsColumnInformationDao;
+import com.ycl.mapper.NewsColumnInformationDao;
import com.ycl.entity.NewsColumnInformation;
import com.ycl.service.NewsColumnInformationService;
import org.springframework.stereotype.Service;
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 a811dd9..a0c1cdb 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
@@ -1,7 +1,7 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.dao.NewsColumnDao;
+import com.ycl.mapper.NewsColumnDao;
import com.ycl.entity.NewsColumn;
import com.ycl.service.NewsColumnService;
import org.springframework.stereotype.Service;
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
deleted file mode 100644
index 850bdae..0000000
--- a/ycl-platform/src/main/java/com/ycl/service/impl/NewsDepartmentInformationServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-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 2ebbf0d..d1df1b7 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
@@ -1,7 +1,7 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.dao.NewsDepartmentDao;
+import com.ycl.mapper.NewsDepartmentDao;
import com.ycl.entity.NewsDepartment;
import com.ycl.service.NewsDepartmentService;
import org.springframework.stereotype.Service;
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 8be6bcf..4f2d53d 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
@@ -1,7 +1,7 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.dao.NewsDutyDao;
+import com.ycl.mapper.NewsDutyDao;
import com.ycl.entity.NewsDuty;
import com.ycl.service.NewsDutyService;
import org.springframework.stereotype.Service;
diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationPoliceServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationPoliceServiceImpl.java
new file mode 100644
index 0000000..7a341ca
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/impl/NewsInformationPoliceServiceImpl.java
@@ -0,0 +1,19 @@
+package com.ycl.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.dao.NewsInformationPoliceDao;
+import com.ycl.entity.NewsInformationPolice;
+import com.ycl.service.NewsInformationPoliceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 璧勮璀﹀憳涓棿琛�(NewsInformationPolice)琛ㄦ湇鍔″疄鐜扮被
+ *
+ * @author makejava
+ * @since 2022-11-17 15:17:22
+ */
+@Service("newsInformationPoliceService")
+public class NewsInformationPoliceServiceImpl extends ServiceImpl<NewsInformationPoliceDao, NewsInformationPolice> implements NewsInformationPoliceService {
+
+}
+
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 1a4850e..d08da85 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
@@ -1,7 +1,7 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.dao.NewsInformationDao;
+import com.ycl.mapper.NewsInformationDao;
import com.ycl.entity.NewsInformation;
import com.ycl.service.NewsInformationService;
import org.springframework.stereotype.Service;
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 d8c9bb4..c33fcfc 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
@@ -1,7 +1,7 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.dao.NewsIpDao;
+import com.ycl.mapper.NewsIpDao;
import com.ycl.entity.NewsIp;
import com.ycl.service.NewsIpService;
import org.springframework.stereotype.Service;
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 2ca2d41..b89dee8 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
@@ -1,10 +1,14 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.dao.NewsPoliceDao;
+import com.ycl.mapper.NewsPoliceDao;
import com.ycl.entity.NewsPolice;
import com.ycl.service.NewsPoliceService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 璀﹀憳琛�
@@ -16,5 +20,12 @@
@Service("newsPoliceService")
public class NewsPoliceServiceImpl extends ServiceImpl<NewsPoliceDao, NewsPolice> implements NewsPoliceService {
+ @Autowired
+ NewsPoliceDao newsPoliceDao;
+
+ @Override
+ public NewsPolice savePolice(NewsPolice newsPolice) {
+ return newsPoliceDao.savePolice(newsPolice);
+ }
}
diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index fb136e5..49c9401 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/ycl-platform/src/main/resources/application-dev.yml
@@ -1,66 +1,68 @@
-server:
- port: 8082
- tomcat:
- uri-encoding: UTF-8
- servlet:
- context-path: /air
- compression: true
-
-fdfs:
- fileUrl: http://140.143.152.226:8410/
- groupName: sczhzf
- soTimeout: 1500
- connectTimeout: 600
- trackerList: #TrackerList鍙傛暟,鏀寔澶氫釜
- - 140.143.152.226:22122
-
-cfg:
- res: d://resources
- media-res: 140.143.152.226/media/
- snow-flake:
- datacenterId: 1
- machineId: 1
-
-spring:
- redis:
- database: 0
- host: 42.193.1.25
- port: 6379
- password: ycl2018
- jedis:
- pool:
- max-active: 8
- max-idle: 8
- min-idle: 0
- timeout: 0
-
- datasource:
- url: jdbc:mysql://42.193.1.25:3306/news_website?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
- username: root
- password: 321$YcYl@1970!
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- filters: stat
- maxActive: 20
- initialSize: 1
- maxWait: 60000
- minIdle: 1
- timeBetweenEvictionRunsMillis: 60000
- minEvictableIdleTimeMillis: 300000
- validationQuery: select 'x'
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- poolPreparedStatements: true
- maxOpenPreparedStatements: 20
-e-mail:
- sendHost: smtp.qq.com
- username: 1723292425@qq.com
- password: qizcitupatzoeeij
-
-SMS:
- ecName: ycl
- apId: 1
- sign: sign
- url: http://localhost:8082/sccg/text/sms_res
-
+server:
+ port: 8082
+ tomcat:
+ uri-encoding: UTF-8
+ servlet:
+ context-path: /air
+ compression: true
+
+fdfs:
+ fileUrl: http://140.143.152.226:8410/
+ groupName: sczhzf
+ soTimeout: 1500
+ connectTimeout: 600
+ trackerList: #TrackerList鍙傛暟,鏀寔澶氫釜
+ - 140.143.152.226:22122
+
+cfg:
+ res: d://resources
+ media-res: 140.143.152.226/media/
+ snow-flake:
+ datacenterId: 1
+ machineId: 1
+
+spring:
+ redis:
+ database: 0
+ host: 42.193.1.25
+ port: 6379
+ password: ycl2018
+ jedis:
+ pool:
+ max-active: 8
+ max-idle: 8
+ min-idle: 0
+ timeout: 0
+
+ datasource:
+ url: jdbc:mysql://42.193.1.25:3306/news_website?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+ username: root
+ password: 321$YcYl@1970!
+ type: com.alibaba.druid.pool.DruidDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ filters: stat
+ maxActive: 20
+ initialSize: 1
+ maxWait: 60000
+ minIdle: 1
+ timeBetweenEvictionRunsMillis: 60000
+ minEvictableIdleTimeMillis: 300000
+ validationQuery: select 'x'
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ poolPreparedStatements: true
+ maxOpenPreparedStatements: 20
+e-mail:
+ sendHost: smtp.qq.com
+ username: 1723292425@qq.com
+ password: qizcitupatzoeeij
+
+SMS:
+ ecName: ycl
+ apId: 1
+ sign: sign
+ url: http://localhost:8082/sccg/text/sms_res
+
+admin:
+ defaultPassword: 111111
diff --git a/ycl-platform/src/main/resources/application.yml b/ycl-platform/src/main/resources/application.yml
index dd105db..0ec856e 100644
--- a/ycl-platform/src/main/resources/application.yml
+++ b/ycl-platform/src/main/resources/application.yml
@@ -1,92 +1,60 @@
-spring:
- profiles:
- active: dev
- main:
- allow-circular-references: true
- allow-bean-definition-overriding: true
- mvc:
- pathmatch:
- matching-strategy: ant_path_matcher
- application:
- name: sccg-platform
- http:
- charset: UTF-8
- enabled: true
- force: true
- servlet:
- multipart:
- max-file-size: -1
- max-request-size: -1
-# jackson:
-# default-property-inclusion: non_null
-
-
-management:
- health:
- rabbit:
- enabled: false
-
-jwt:
- tokenHeader: Authorization #JWT瀛樺偍鐨勮姹傚ご
- secret: platform-secret #JWT鍔犺В瀵嗕娇鐢ㄧ殑瀵嗛挜
- expiration: 604800 #JWT鐨勮秴鏈熼檺鏃堕棿(60*60*24*7)
- tokenHead: 'Bearer ' #JWT璐熻浇涓嬁鍒板紑澶�
-
-redis:
- database: sccg
- key:
- admin: 'ums:admin'
- resourceList: 'ums:menuList'
- expire:
- common: 86400 # 24灏忔椂
-
-#MP閰嶇疆
-mybatis-plus:
- mapper-locations: classpath*:mapper/**/*.xml
- global-config:
- db-config:
- id-type: auto
- #閫昏緫鍒犻櫎閰嶇疆瀛楁
- logic-delete-field:
- #閫昏緫鍒犻櫎閰嶇疆瀛楁 1 鍒犻櫎
- logic-delete-value: 1
- #閫昏緫鍒犻櫎閰嶇疆瀛楁 0 涓嶅垹闄�
- logic-not-delete-value: 0
-
-knife4j:
- enable: true
- #true鍒欐槸鐢熶骇鐜涓嶅厑璁歌闂甼nife4j
- production: false
-
-
-security:
- basic:
- enabled: false
-secure:
- ignored:
- urls: #閰嶇疆鐧藉悕鍗曡矾寰�
- - /swagger-ui.html
- - /swagger/**
- - /swagger-ui/*
- - /swagger-resources/**
- - /**/v2/api-docs
- - /doc.html
- - /webjars/**
- - /**/*.html
- - /**/*.js
- - /**/*.css
- - /**/*.png
- - /favicon.ico
- - /actuator/**
- - /druid/**
- - /**/admin/login
- - /**/admin/register
- - /**/admin/info
- - /**/admin/logout
- - /dict/**
- - /sccg-region/**
- - /**/system/portal/logo/search
- - /**/unauthorized/**
- - /**/api/**
- - /**/text/**
- - /trendAnalysis/**
\ No newline at end of file
+spring:
+ profiles:
+ active: dev
+ main:
+ allow-circular-references: true
+ allow-bean-definition-overriding: true
+ mvc:
+ pathmatch:
+ matching-strategy: ant_path_matcher
+ application:
+ name: sccg-platform
+ http:
+ charset: UTF-8
+ enabled: true
+ force: true
+ servlet:
+ multipart:
+ max-file-size: -1
+ max-request-size: -1
+# jackson:
+# default-property-inclusion: non_null
+
+
+management:
+ health:
+ rabbit:
+ enabled: false
+
+jwt:
+ tokenHeader: Authorization #JWT瀛樺偍鐨勮姹傚ご
+ secret: platform-secret #JWT鍔犺В瀵嗕娇鐢ㄧ殑瀵嗛挜
+ expiration: 604800 #JWT鐨勮秴鏈熼檺鏃堕棿(60*60*24*7)
+ tokenHead: 'Bearer ' #JWT璐熻浇涓嬁鍒板紑澶�
+
+redis:
+ database: sccg
+ key:
+ admin: 'ums:admin'
+ resourceList: 'ums:menuList'
+ expire:
+ common: 86400 # 24灏忔椂
+
+#MP閰嶇疆
+mybatis-plus:
+ mapper-locations: classpath*:mapper/**/*.xml
+ global-config:
+ db-config:
+ id-type: auto
+ #閫昏緫鍒犻櫎閰嶇疆瀛楁
+ logic-delete-field:
+ #閫昏緫鍒犻櫎閰嶇疆瀛楁 1 鍒犻櫎
+ logic-delete-value: 1
+ #閫昏緫鍒犻櫎閰嶇疆瀛楁 0 涓嶅垹闄�
+ logic-not-delete-value: 0
+
+knife4j:
+ enable: true
+ #true鍒欐槸鐢熶骇鐜涓嶅厑璁歌闂甼nife4j
+ production: false
+
diff --git a/ycl-platform/src/main/resources/mapper/NewsAdminDao.xml b/ycl-platform/src/main/resources/mapper/NewsAdminDao.xml
index 235870b..62694b0 100644
--- a/ycl-platform/src/main/resources/mapper/NewsAdminDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsAdminDao.xml
@@ -1,6 +1,6 @@
<?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.NewsAdminDao">
+<mapper namespace="com.ycl.mapper.NewsAdminDao">
<resultMap type="com.ycl.entity.NewsAdmin" id="NewsAdminMap">
<result property="id" column="id" jdbcType="INTEGER"/>
diff --git a/ycl-platform/src/main/resources/mapper/NewsChannelColumnDao.xml b/ycl-platform/src/main/resources/mapper/NewsChannelColumnDao.xml
index 19343ef..2fc4316 100644
--- a/ycl-platform/src/main/resources/mapper/NewsChannelColumnDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsChannelColumnDao.xml
@@ -1,6 +1,6 @@
<?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.NewsChannelColumnDao">
+<mapper namespace="com.ycl.mapper.NewsChannelColumnDao">
<resultMap type="com.ycl.entity.NewsChannelColumn" id="NewsChannelColumnMap">
<result property="id" column="id" jdbcType="INTEGER"/>
diff --git a/ycl-platform/src/main/resources/mapper/NewsChannelDao.xml b/ycl-platform/src/main/resources/mapper/NewsChannelDao.xml
index 0c5a63a..7d18317 100644
--- a/ycl-platform/src/main/resources/mapper/NewsChannelDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsChannelDao.xml
@@ -1,6 +1,6 @@
<?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.NewsChannelDao">
+<mapper namespace="com.ycl.mapper.NewsChannelDao">
<resultMap type="com.ycl.entity.NewsChannel" id="NewsChannelMap">
<result property="id" column="id" jdbcType="INTEGER"/>
diff --git a/ycl-platform/src/main/resources/mapper/NewsColumnDao.xml b/ycl-platform/src/main/resources/mapper/NewsColumnDao.xml
index bddd09b..140a9b9 100644
--- a/ycl-platform/src/main/resources/mapper/NewsColumnDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsColumnDao.xml
@@ -1,6 +1,6 @@
<?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.NewsColumnDao">
+<mapper namespace="com.ycl.mapper.NewsColumnDao">
<resultMap type="com.ycl.entity.NewsColumn" id="NewsColumnMap">
<result property="id" column="id" jdbcType="VARCHAR"/>
diff --git a/ycl-platform/src/main/resources/mapper/NewsColumnInformationDao.xml b/ycl-platform/src/main/resources/mapper/NewsColumnInformationDao.xml
index 7104d3a..900c2fa 100644
--- a/ycl-platform/src/main/resources/mapper/NewsColumnInformationDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsColumnInformationDao.xml
@@ -1,6 +1,6 @@
<?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.NewsColumnInformationDao">
+<mapper namespace="com.ycl.mapper.NewsColumnInformationDao">
<resultMap type="com.ycl.entity.NewsColumnInformation" id="NewsColumnInformationMap">
<result property="id" column="id" jdbcType="INTEGER"/>
diff --git a/ycl-platform/src/main/resources/mapper/NewsDepartmentDao.xml b/ycl-platform/src/main/resources/mapper/NewsDepartmentDao.xml
index 3c4f663..aa279d1 100644
--- a/ycl-platform/src/main/resources/mapper/NewsDepartmentDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsDepartmentDao.xml
@@ -1,6 +1,6 @@
<?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.NewsDepartmentDao">
+<mapper namespace="com.ycl.mapper.NewsDepartmentDao">
<resultMap type="com.ycl.entity.NewsDepartment" id="NewsDepartmentMap">
<result property="id" column="id" jdbcType="INTEGER"/>
diff --git a/ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml b/ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml
index 6a364f1..fbe809b 100644
--- a/ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsDepartmentInformationDao.xml
@@ -1,6 +1,6 @@
<?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">
+<mapper namespace="com.ycl.mapper.NewsDepartmentInformationDao">
<resultMap type="com.ycl.entity.NewsDepartmentInformation" id="NewsDepartmentInformationMap">
<result property="id" column="id" jdbcType="INTEGER"/>
diff --git a/ycl-platform/src/main/resources/mapper/NewsDutyDao.xml b/ycl-platform/src/main/resources/mapper/NewsDutyDao.xml
index d5976f3..bbfc93b 100644
--- a/ycl-platform/src/main/resources/mapper/NewsDutyDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsDutyDao.xml
@@ -1,6 +1,6 @@
<?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.NewsDutyDao">
+<mapper namespace="com.ycl.mapper.NewsDutyDao">
<resultMap type="com.ycl.entity.NewsDuty" id="NewsDutyMap">
<result property="id" column="id" jdbcType="INTEGER"/>
diff --git a/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml b/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml
index a82c74d..d3e7112 100644
--- a/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsInformationDao.xml
@@ -1,6 +1,6 @@
<?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.NewsInformationDao">
+<mapper namespace="com.ycl.mapper.NewsInformationDao">
<resultMap type="com.ycl.entity.NewsInformation" id="NewsInformationMap">
<result property="id" column="id" jdbcType="VARCHAR"/>
diff --git a/ycl-platform/src/main/resources/mapper/NewsInformationPoliceDao.xml b/ycl-platform/src/main/resources/mapper/NewsInformationPoliceDao.xml
new file mode 100644
index 0000000..38a5160
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/NewsInformationPoliceDao.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.NewsInformationPoliceDao">
+
+ <resultMap type="com.ycl.entity.NewsInformationPolice" id="NewsInformationPoliceMap">
+ <result property="id" column="id" jdbcType="INTEGER"/>
+ <result property="newsInformationId" column="news_information_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_information_police(news_information_id, news_police_id, is_sign)
+ values
+ <foreach collection="entities" item="entity" separator=",">
+ (#{entity.newsInformationId}, #{entity.newsPoliceId}, #{entity.isSign})
+ </foreach>
+ </insert>
+ <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
+ <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+ insert into news_website.news_information_police(news_information_id, news_police_id, is_sign)
+ values
+ <foreach collection="entities" item="entity" separator=",">
+ (#{entity.newsInformationId}, #{entity.newsPoliceId}, #{entity.isSign})
+ </foreach>
+ on duplicate key update
+ news_information_id = values(news_information_id) , news_police_id = values(news_police_id) , is_sign = values(is_sign) </insert>
+
+</mapper>
+
diff --git a/ycl-platform/src/main/resources/mapper/NewsIpDao.xml b/ycl-platform/src/main/resources/mapper/NewsIpDao.xml
index 6a81cb9..ae73d25 100644
--- a/ycl-platform/src/main/resources/mapper/NewsIpDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsIpDao.xml
@@ -1,6 +1,6 @@
<?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.NewsIpDao">
+<mapper namespace="com.ycl.mapper.NewsIpDao">
<resultMap type="com.ycl.entity.NewsIp" id="NewsIpMap">
<result property="id" column="id" jdbcType="INTEGER"/>
diff --git a/ycl-platform/src/main/resources/mapper/NewsPoliceDao.xml b/ycl-platform/src/main/resources/mapper/NewsPoliceDao.xml
index dcfda73..87d118b 100644
--- a/ycl-platform/src/main/resources/mapper/NewsPoliceDao.xml
+++ b/ycl-platform/src/main/resources/mapper/NewsPoliceDao.xml
@@ -1,6 +1,6 @@
<?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.NewsPoliceDao">
+<mapper namespace="com.ycl.mapper.NewsPoliceDao">
<resultMap type="com.ycl.entity.NewsPolice" id="NewsPoliceMap">
<result property="id" column="id" jdbcType="VARCHAR"/>
@@ -29,5 +29,9 @@
on duplicate key update
rname = values(rname) , create_time = values(create_time) , update_time = values(update_time) , news_department_id = values(news_department_id) , phone = values(phone) </insert>
+ <insert id="savePolice" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+ insert into news_website.news_police(rname, create_time, update_time, news_department_id, phone)
+ values (#{entity.rname}, #{entity.createTime}, #{entity.updateTime}, #{entity.newsDepartmentId}, #{entity.phone})
+ </insert>
</mapper>
diff --git a/ycl-platform/target/classes/application-dev.yml b/ycl-platform/target/classes/application-dev.yml
deleted file mode 100644
index fb136e5..0000000
--- a/ycl-platform/target/classes/application-dev.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-server:
- port: 8082
- tomcat:
- uri-encoding: UTF-8
- servlet:
- context-path: /air
- compression: true
-
-fdfs:
- fileUrl: http://140.143.152.226:8410/
- groupName: sczhzf
- soTimeout: 1500
- connectTimeout: 600
- trackerList: #TrackerList鍙傛暟,鏀寔澶氫釜
- - 140.143.152.226:22122
-
-cfg:
- res: d://resources
- media-res: 140.143.152.226/media/
- snow-flake:
- datacenterId: 1
- machineId: 1
-
-spring:
- redis:
- database: 0
- host: 42.193.1.25
- port: 6379
- password: ycl2018
- jedis:
- pool:
- max-active: 8
- max-idle: 8
- min-idle: 0
- timeout: 0
-
- datasource:
- url: jdbc:mysql://42.193.1.25:3306/news_website?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
- username: root
- password: 321$YcYl@1970!
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- filters: stat
- maxActive: 20
- initialSize: 1
- maxWait: 60000
- minIdle: 1
- timeBetweenEvictionRunsMillis: 60000
- minEvictableIdleTimeMillis: 300000
- validationQuery: select 'x'
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- poolPreparedStatements: true
- maxOpenPreparedStatements: 20
-e-mail:
- sendHost: smtp.qq.com
- username: 1723292425@qq.com
- password: qizcitupatzoeeij
-
-SMS:
- ecName: ycl
- apId: 1
- sign: sign
- url: http://localhost:8082/sccg/text/sms_res
-
diff --git a/ycl-platform/target/classes/application-pro.yml b/ycl-platform/target/classes/application-pro.yml
deleted file mode 100644
index 1221ace..0000000
--- a/ycl-platform/target/classes/application-pro.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-server:
- port: 8081
- tomcat:
- uri-encoding: UTF-8
- servlet:
- context-path: /sccg
- compression: true
-
-fdfs:
- fileUrl: http://140.143.152.226:8410/
- groupName: sczhzf
- soTimeout: 1500
- connectTimeout: 600
- trackerList: #TrackerList鍙傛暟,鏀寔澶氫釜
- - 140.143.152.226:22122
- -
-cfg:
- res: d://resources
- media-res: 140.143.152.226/media/
- snow-flake:
- datacenterId: 1
- machineId: 1
-
-spring:
- redis:
- database: 0
- host: localhost
- password:
- jedis:
- pool:
- max-active: 8
- max-idle: 8
- min-idle: 0
- timeout: 0
- datasource:
- url: jdbc:mysql://42.193.1.25:3306/sccg?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
- username: root
- password: 321$YcYl@1970!
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- filters: stat
- maxActive: 20
- initialSize: 1
- maxWait: 60000
- minIdle: 1
- timeBetweenEvictionRunsMillis: 60000
- minEvictableIdleTimeMillis: 300000
- validationQuery: select 'x'
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- poolPreparedStatements: true
- maxOpenPreparedStatements: 20
diff --git a/ycl-platform/target/classes/application.yml b/ycl-platform/target/classes/application.yml
deleted file mode 100644
index dd105db..0000000
--- a/ycl-platform/target/classes/application.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-spring:
- profiles:
- active: dev
- main:
- allow-circular-references: true
- allow-bean-definition-overriding: true
- mvc:
- pathmatch:
- matching-strategy: ant_path_matcher
- application:
- name: sccg-platform
- http:
- charset: UTF-8
- enabled: true
- force: true
- servlet:
- multipart:
- max-file-size: -1
- max-request-size: -1
-# jackson:
-# default-property-inclusion: non_null
-
-
-management:
- health:
- rabbit:
- enabled: false
-
-jwt:
- tokenHeader: Authorization #JWT瀛樺偍鐨勮姹傚ご
- secret: platform-secret #JWT鍔犺В瀵嗕娇鐢ㄧ殑瀵嗛挜
- expiration: 604800 #JWT鐨勮秴鏈熼檺鏃堕棿(60*60*24*7)
- tokenHead: 'Bearer ' #JWT璐熻浇涓嬁鍒板紑澶�
-
-redis:
- database: sccg
- key:
- admin: 'ums:admin'
- resourceList: 'ums:menuList'
- expire:
- common: 86400 # 24灏忔椂
-
-#MP閰嶇疆
-mybatis-plus:
- mapper-locations: classpath*:mapper/**/*.xml
- global-config:
- db-config:
- id-type: auto
- #閫昏緫鍒犻櫎閰嶇疆瀛楁
- logic-delete-field:
- #閫昏緫鍒犻櫎閰嶇疆瀛楁 1 鍒犻櫎
- logic-delete-value: 1
- #閫昏緫鍒犻櫎閰嶇疆瀛楁 0 涓嶅垹闄�
- logic-not-delete-value: 0
-
-knife4j:
- enable: true
- #true鍒欐槸鐢熶骇鐜涓嶅厑璁歌闂甼nife4j
- production: false
-
-
-security:
- basic:
- enabled: false
-secure:
- ignored:
- urls: #閰嶇疆鐧藉悕鍗曡矾寰�
- - /swagger-ui.html
- - /swagger/**
- - /swagger-ui/*
- - /swagger-resources/**
- - /**/v2/api-docs
- - /doc.html
- - /webjars/**
- - /**/*.html
- - /**/*.js
- - /**/*.css
- - /**/*.png
- - /favicon.ico
- - /actuator/**
- - /druid/**
- - /**/admin/login
- - /**/admin/register
- - /**/admin/info
- - /**/admin/logout
- - /dict/**
- - /sccg-region/**
- - /**/system/portal/logo/search
- - /**/unauthorized/**
- - /**/api/**
- - /**/text/**
- - /trendAnalysis/**
\ No newline at end of file
diff --git a/ycl-platform/target/classes/logback-spring.xml b/ycl-platform/target/classes/logback-spring.xml
deleted file mode 100644
index 4331451..0000000
--- a/ycl-platform/target/classes/logback-spring.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
- <property name="LOG_HOME" value="${user.dir}/logs/ycl/platform" />
-
- <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{H:mm} %-5level [%logger{16}] %msg%n</pattern>
- </encoder>
- </appender>
- <!-- class="ch.qos.logback.core.rolling.RollingFileAppender">-->
- <appender name="normalLog"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <FileNamePattern>${LOG_HOME}/normal/%d{yyyy-MM-dd}/%i.log</FileNamePattern>
- <MaxHistory>30</MaxHistory>
- <maxFileSize>2MB</maxFileSize>
- </rollingPolicy>
- <!--<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <FileNamePattern>${LOG_HOME}/job.normal.%d{yyyy-MM-dd}.log
- </FileNamePattern>
- <MaxHistory>30</MaxHistory>
- </rollingPolicy>
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>-->
- <layout class="ch.qos.logback.classic.PatternLayout">
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{16} - %msg%n
- </pattern>
- </layout>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>ERROR</level>
- <onMatch>DENY</onMatch>
- <onMismatch>ACCEPT</onMismatch>
- </filter>
- </appender>
-
- <appender name="ASYNC-INFO" class="ch.qos.logback.classic.AsyncAppender">
- <discardingThreshold>0</discardingThreshold>
- <queueSize>256</queueSize>
- <appender-ref ref="normalLog"/>
- </appender>
-
-
-
- <appender name="errorLog"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
-
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <FileNamePattern>${LOG_HOME}/error/%d{yyyy-MM-dd}/%i.log</FileNamePattern>
- <MaxHistory>30</MaxHistory>
- <maxFileSize>2MB</maxFileSize>
- </rollingPolicy>
- <!--<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <FileNamePattern>${LOG_HOME}/job.error.%d{yyyy-MM-dd}.log
- </FileNamePattern>
- <MaxHistory>30</MaxHistory>
- </rollingPolicy>
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>-->
- <layout class="ch.qos.logback.classic.PatternLayout">
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{16} - %msg%n
- </pattern>
- </layout>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>ERROR</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
-
-
- <appender name="ASYNC-ERROR" class="ch.qos.logback.classic.AsyncAppender">
- <discardingThreshold>0</discardingThreshold>
- <queueSize>256</queueSize>
- <appender-ref ref="errorLog"/>
- </appender>
-
- <appender name="ASYNC-CONSOLE" class="ch.qos.logback.classic.AsyncAppender">
- <discardingThreshold>0</discardingThreshold>
- <queueSize>256</queueSize>
- <appender-ref ref="Console"/>
- </appender>
-
-
-
-<!-- <logger name="com.ycl" level="debug" >
-
- </logger >-->
- <springProfile name="dev">
- <!--鎵撳嵃SQL-->
- <logger name="java.sql.Connection" level="DEBUG" />
- <logger name="java.sql.Statement" level="DEBUG" />
- <logger name="java.sql.PreparedStatement" level="DEBUG" />
-
- <logger name="com.ycl.component" level="error" />
-
- <logger name="com.ycl" level="debug" >
- <appender-ref ref="normalLog" />
- <appender-ref ref="errorLog" />
- </logger>
-
- <root level="info">
- <appender-ref ref="Console" />
- <appender-ref ref="normalLog" />
- <appender-ref ref="errorLog" />
- </root>
- </springProfile>
-
- <springProfile name="pro">
- <!--鎵撳嵃SQL-->
- <logger name="java.sql.Connection" level="ERROR" />
- <logger name="java.sql.Statement" level="ERROR" />
- <logger name="java.sql.PreparedStatement" level="ERROR" />
- <logger name="com.ycl" level="debug" >
- <appender-ref ref="normalLog" />
- <appender-ref ref="errorLog" />
- </logger>
- <root level="info">
- <appender-ref ref="Console" />
- </root>
- </springProfile>
-
-
-
-
-</configuration>
\ No newline at end of file
diff --git a/ycl-platform/target/classes/mapper/NewsChannelColumnDao.xml b/ycl-platform/target/classes/mapper/NewsChannelColumnDao.xml
deleted file mode 100644
index b64220c..0000000
--- a/ycl-platform/target/classes/mapper/NewsChannelColumnDao.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.mapper.NewsChannelColumnDao">
-
- <resultMap type="com.ycl.entity.NewsChannelColumn" id="NewsChannelColumnMap">
- <result property="id" column="id" jdbcType="INTEGER"/>
- <result property="channelId" column="channel_id" jdbcType="INTEGER"/>
- <result property="columnId" column="column_id" jdbcType="INTEGER"/>
- </resultMap>
-
- <!-- 鎵归噺鎻掑叆 -->
- <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_channel_column(channel_id, column_id)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.channelId}, #{entity.columnId})
- </foreach>
- </insert>
- <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
- <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_channel_column(channel_id, column_id)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.channelId}, #{entity.columnId})
- </foreach>
- on duplicate key update
- channel_id = values(channel_id) , column_id = values(column_id) </insert>
-
-</mapper>
-
diff --git a/ycl-platform/target/classes/mapper/NewsChannelDao.xml b/ycl-platform/target/classes/mapper/NewsChannelDao.xml
deleted file mode 100644
index 3f10f81..0000000
--- a/ycl-platform/target/classes/mapper/NewsChannelDao.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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.mapper.NewsChannelDao">
-
- <resultMap type="com.ycl.entity.NewsChannel" id="NewsChannelMap">
- <result property="id" column="id" jdbcType="INTEGER"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="code" column="code" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- </resultMap>
-
- <!-- 鎵归噺鎻掑叆 -->
- <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_channel(name, code, create_time)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.name}, #{entity.code}, #{entity.createTime})
- </foreach>
- </insert>
- <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
- <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_channel(name, code, create_time)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.name}, #{entity.code}, #{entity.createTime})
- </foreach>
- on duplicate key update
- name = values(name) , code = values(code) , create_time = values(create_time) </insert>
-
-</mapper>
-
diff --git a/ycl-platform/target/classes/mapper/NewsColumnDao.xml b/ycl-platform/target/classes/mapper/NewsColumnDao.xml
deleted file mode 100644
index 0d8456b..0000000
--- a/ycl-platform/target/classes/mapper/NewsColumnDao.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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.mapper.NewsColumnDao">
-
- <resultMap type="com.ycl.entity.NewsColumn" id="NewsColumnMap">
- <result property="id" column="id" jdbcType="VARCHAR"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- </resultMap>
-
- <!-- 鎵归噺鎻掑叆 -->
- <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_column(name)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.name})
- </foreach>
- </insert>
- <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
- <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_column(name)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.name})
- </foreach>
- on duplicate key update
- name = values(name) </insert>
-
-</mapper>
-
diff --git a/ycl-platform/target/classes/mapper/NewsColumnInformationDao.xml b/ycl-platform/target/classes/mapper/NewsColumnInformationDao.xml
deleted file mode 100644
index 90092d1..0000000
--- a/ycl-platform/target/classes/mapper/NewsColumnInformationDao.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.mapper.NewsColumnInformationDao">
-
- <resultMap type="com.ycl.entity.NewsColumnInformation" id="NewsColumnInformationMap">
- <result property="id" column="id" jdbcType="INTEGER"/>
- <result property="columnId" column="column_id" jdbcType="INTEGER"/>
- <result property="informationId" column="information_id" jdbcType="INTEGER"/>
- </resultMap>
-
- <!-- 鎵归噺鎻掑叆 -->
- <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_column_information(column_id, information_id)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.columnId}, #{entity.informationId})
- </foreach>
- </insert>
- <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
- <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_column_information(column_id, information_id)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.columnId}, #{entity.informationId})
- </foreach>
- on duplicate key update
- column_id = values(column_id) , information_id = values(information_id) </insert>
-
-</mapper>
-
diff --git a/ycl-platform/target/classes/mapper/NewsDutyDao.xml b/ycl-platform/target/classes/mapper/NewsDutyDao.xml
deleted file mode 100644
index b9774a5..0000000
--- a/ycl-platform/target/classes/mapper/NewsDutyDao.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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.mapper.NewsDutyDao">
-
- <resultMap type="com.ycl.entity.NewsDuty" id="NewsDutyMap">
- <result property="id" column="id" jdbcType="INTEGER"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="jobTitle" column="job_title" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="dutyTime" column="duty_time" jdbcType="TIMESTAMP"/>
- </resultMap>
-
- <!-- 鎵归噺鎻掑叆 -->
- <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_duty(name, job_title, create_time, duty_time)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.name}, #{entity.jobTitle}, #{entity.createTime}, #{entity.dutyTime})
- </foreach>
- </insert>
- <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
- <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_duty(name, job_title, create_time, duty_time)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.name}, #{entity.jobTitle}, #{entity.createTime}, #{entity.dutyTime})
- </foreach>
- on duplicate key update
- name = values(name) , job_title = values(job_title) , create_time = values(create_time) , duty_time = values(duty_time) </insert>
-
-</mapper>
-
diff --git a/ycl-platform/target/classes/mapper/NewsInformationDao.xml b/ycl-platform/target/classes/mapper/NewsInformationDao.xml
deleted file mode 100644
index 5d3c9fe..0000000
--- a/ycl-platform/target/classes/mapper/NewsInformationDao.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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.mapper.NewsInformationDao">
-
- <resultMap type="com.ycl.entity.NewsInformation" id="NewsInformationMap">
- <result property="id" column="id" jdbcType="VARCHAR"/>
- <result property="title" column="title" jdbcType="VARCHAR"/>
- <result property="content" column="content" jdbcType="VARCHAR"/>
- <result property="publishTime" column="publish_time" jdbcType="TIMESTAMP"/>
- <result property="isSign" column="is_sign" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="sendTo" column="send_to" jdbcType="VARCHAR"/>
- <result property="imageUrl" column="image_url" 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)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{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)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{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) </insert>
-
-</mapper>
-
diff --git a/ycl-platform/target/classes/mapper/NewsIpDao.xml b/ycl-platform/target/classes/mapper/NewsIpDao.xml
deleted file mode 100644
index 120e2a1..0000000
--- a/ycl-platform/target/classes/mapper/NewsIpDao.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.mapper.NewsIpDao">
-
- <resultMap type="com.ycl.entity.NewsIp" id="NewsIpMap">
- <result property="id" column="id" jdbcType="INTEGER"/>
- <result property="ipAddess" column="ip_addess" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- </resultMap>
-
- <!-- 鎵归噺鎻掑叆 -->
- <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_ip(ip_addess, create_time)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.ipAddess}, #{entity.createTime})
- </foreach>
- </insert>
- <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
- <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_ip(ip_addess, create_time)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.ipAddess}, #{entity.createTime})
- </foreach>
- on duplicate key update
- ip_addess = values(ip_addess) , create_time = values(create_time) </insert>
-
-</mapper>
-
diff --git a/ycl-platform/target/classes/mapper/NewsPoliceDao.xml b/ycl-platform/target/classes/mapper/NewsPoliceDao.xml
deleted file mode 100644
index b9e6dbc..0000000
--- a/ycl-platform/target/classes/mapper/NewsPoliceDao.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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.mapper.NewsPoliceDao">
-
- <resultMap type="com.ycl.entity.NewsPolice" id="NewsPoliceMap">
- <result property="id" column="id" jdbcType="VARCHAR"/>
- <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"/>
- </resultMap>
-
- <!-- 鎵归噺鎻掑叆 -->
- <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_police(rname, create_time, update_time, organization_name)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.rname}, #{entity.createTime}, #{entity.updateTime}, #{entity.organizationName})
- </foreach>
- </insert>
- <!-- 鎵归噺鎻掑叆鎴栨寜涓婚敭鏇存柊 -->
- <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
- insert into news_website.news_police(rname, create_time, update_time, organization_name)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.rname}, #{entity.createTime}, #{entity.updateTime}, #{entity.organizationName})
- </foreach>
- on duplicate key update
- rname = values(rname) , create_time = values(create_time) , update_time = values(update_time) , organization_name = values(organization_name) </insert>
-
-</mapper>
-
--
Gitblit v1.8.0