diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginDto.java b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginDto.java
index 54a3dc3f..8825215f 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginDto.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginDto.java
@@ -20,6 +20,16 @@ public class SysApplicationPluginDto {
private Integer pageNum;
private Integer pageSize;
+ private String typeId;
+
+ public String getTypeId() {
+ return typeId;
+ }
+
+ public void setTypeId(String typeId) {
+ this.typeId = typeId;
+ }
+
public String getAppId() {
return appId;
}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.java
index 5929e14b..79b8c326 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.java
@@ -22,13 +22,33 @@ public class SysApplicationPluginEntity extends BaseEntity {
private String pluginVersion;
/** 描述 */
private String pluginRemark;
+ /** 插件类型id */
+ private String typeId;
+ /** 插件类型名称 */
+ private String typeName;
/** 发布日期 */
private Date releaseDate;
/** 启用停用（1启用2停用） */
private String pluginStatus;
-
+ /** 附件id */
private String attachmentId;
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
+ public String getTypeId() {
+ return typeId;
+ }
+
+ public void setTypeId(String typeId) {
+ this.typeId = typeId;
+ }
+
public String getPluginPackageName() {
return pluginPackageName;
}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.xml
index 90b5444d..5ba4c199 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.xml
@@ -20,6 +20,8 @@
<result property="org_id" column="org_id" jdbcType="VARCHAR"/>
<result property="attachmentId" column="attachment_id" jdbcType="VARCHAR"/>
<result property="pluginPackageName" column="plugin_package_name" jdbcType="VARCHAR"/>
+ <result property="typeId" column="type_id" jdbcType="VARCHAR"/>
+ <result property="typeName" column="type_name" jdbcType="VARCHAR"/>
</resultMap>
<!-- 查询的字段-->
<sql id = "SysApplicationPluginEntity_Base_Column_List">
@@ -40,6 +42,7 @@
,org_id
,attachment_id
,plugin_package_name
+ ,type_id
</sql>
<!--通过ID获取数据 -->
<select id="entity_get" resultMap="get-SysApplicationPluginEntity-result">
@@ -70,6 +73,7 @@
<if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
<if test="attachmentId != null and attachmentId != ''"> and attachment_id = #{attachmentId} </if>
<if test="pluginPackageName != null and pluginPackageName != ''"> and plugin_package_name = #{pluginPackageName} </if>
+ <if test="typeId != null and typeId != ''"> and type_id = #{typeId} </if>
and sts='Y'
</trim>
<if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -105,30 +109,34 @@
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity">
- select
- <include refid="SysApplicationPluginEntity_Base_Column_List" />
- from sys_application_plugin
+ SELECT
+ p.*,
+ type.NAME AS type_name
+ FROM
+ sys_application_plugin p
+ LEFT JOIN sys_application_plugin_type type ON p.type_id = type.id
<trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
- <if test="appId != null and appId != ''"> and app_id like concat('%',#{appId},'%') </if>
- <if test="pluginName != null and pluginName != ''"> and plugin_name like concat('%',#{pluginName},'%') </if>
- <if test="pluginCode != null and pluginCode != ''"> and plugin_code like concat('%',#{pluginCode},'%') </if>
- <if test="pluginVersion != null and pluginVersion != ''"> and plugin_version like concat('%',#{pluginVersion},'%') </if>
- <if test="pluginRemark != null and pluginRemark != ''"> and plugin_remark like concat('%',#{pluginRemark},'%') </if>
- <if test="releaseDate != null"> and release_date like concat('%',#{releaseDate},'%') </if>
- <if test="pluginStatus != null and pluginStatus != ''"> and plugin_status like concat('%',#{pluginStatus},'%') </if>
- <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
- <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
- <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
- <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
- <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
- <if test="attachmentId != null and attachmentId != ''"> and attachment_id like concat('%',#{attachmentId},'%') </if>
- <if test="pluginPackageName != null and pluginPackageName != ''"> and plugin_package_name like concat('%',#{pluginPackageName},'%') </if>
- and sts='Y'
+ <if test="id != null and id != ''"> and p.id like concat('%',#{id},'%') </if>
+ <if test="appId != null and appId != ''"> and p.app_id like concat('%',#{appId},'%') </if>
+ <if test="pluginName != null and pluginName != ''"> and p.plugin_name like concat('%',#{pluginName},'%') </if>
+ <if test="pluginCode != null and pluginCode != ''"> and p.plugin_code like concat('%',#{pluginCode},'%') </if>
+ <if test="pluginVersion != null and pluginVersion != ''"> and p.plugin_version like concat('%',#{pluginVersion},'%') </if>
+ <if test="pluginRemark != null and pluginRemark != ''"> and p.plugin_remark like concat('%',#{pluginRemark},'%') </if>
+ <if test="releaseDate != null"> and p.release_date like concat('%',#{releaseDate},'%') </if>
+ <if test="pluginStatus != null and pluginStatus != ''"> and p.plugin_status like concat('%',#{pluginStatus},'%') </if>
+ <if test="sorts != null"> and p.sorts like concat('%',#{sorts},'%') </if>
+ <if test="create_user_id != null and create_user_id != ''"> and p.create_user_id like concat('%',#{create_user_id},'%') </if>
+ <if test="create_time != null"> and p.create_time like concat('%',#{create_time},'%') </if>
+ <if test="modify_user_id != null and modify_user_id != ''"> and p.modify_user_id like concat('%',#{modify_user_id},'%') </if>
+ <if test="modify_time != null"> and p.modify_time like concat('%',#{modify_time},'%') </if>
+ <if test="sts != null and sts != ''"> and p.sts like concat('%',#{sts},'%') </if>
+ <if test="org_id != null and org_id != ''"> and p.org_id like concat('%',#{org_id},'%') </if>
+ <if test="attachmentId != null and attachmentId != ''"> and p.attachment_id like concat('%',#{attachmentId},'%') </if>
+ <if test="pluginPackageName != null and pluginPackageName != ''"> and p.plugin_package_name like concat('%',#{pluginPackageName},'%') </if>
+ <if test="typeId != null and typeId != ''"> and p.type_id like concat('%',#{typeId},'%') </if>
+ and p.sts='Y'
</trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+ <if test=" sort == null or sort == ''.toString() "> order by p.sorts asc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select>
@@ -182,6 +190,7 @@
<if test="org_id != null and org_id != ''"> org_id , </if>
<if test="attachmentId != null and attachmentId != ''"> attachment_id , </if>
<if test="pluginPackageName != null and pluginPackageName != ''"> plugin_package_name , </if>
+ <if test="typeId != null and typeId != ''"> type_id , </if>
<if test="sts == null ">sts,</if>
</trim>
)values(
@@ -203,6 +212,7 @@
<if test="org_id != null and org_id != ''"> #{org_id} ,</if>
<if test="attachmentId != null and attachmentId != ''"> #{attachmentId} ,</if>
<if test="pluginPackageName != null and pluginPackageName != ''"> #{pluginPackageName} ,</if>
+ <if test="typeId != null and typeId != ''"> #{typeId} ,</if>
<if test="sts == null ">'Y',</if>
</trim>
)
@@ -254,9 +264,10 @@ update sys_application_plugin set
<if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
<if test="modify_time != null"> modify_time = #{modify_time},</if>
<if test="sts != null and sts != ''"> sts = #{sts},</if>
- <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
+ <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
<if test="attachmentId != null and attachmentId != ''"> attachment_id = #{attachmentId},</if>
<if test="pluginPackageName != null and pluginPackageName != ''"> plugin_package_name = #{pluginPackageName},</if>
+ <if test="typeId != null and typeId != ''"> type_id = #{typeId},</if>
</trim>
where id = #{id}
</update>
@@ -291,16 +302,20 @@ update sys_application_plugin set sts= 'N' ,modify_time = #{modify_time},modify
<!-- 分页查询列表 采用like格式 -->
<select id="queryListlike" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto">
- select
- <include refid="SysApplicationPluginEntity_Base_Column_List" />
- from sys_application_plugin
+ SELECT
+ p.*,
+ type.NAME AS type_name
+ FROM
+ sys_application_plugin p
+ LEFT JOIN sys_application_plugin_type type ON p.type_id = type.id
<trim prefix="where" prefixOverrides="and">
- <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
- <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
- <if test="name != null and name != ''"> and ( plugin_name like concat('%',#{name},'%') or plugin_code like concat('%',#{name},'%') or plugin_version like concat('%',#{name},'%') )</if>
- and sts='Y'
+ <if test="appId != null and appId != ''"> and p.app_id = #{appId} </if>
+ <if test="id != null and id != ''"> and p.id like concat('%',#{id},'%') </if>
+ <if test="name != null and name != ''"> and ( p.plugin_name like concat('%',#{name},'%') or p.plugin_code like concat('%',#{name},'%') or p.plugin_version like concat('%',#{name},'%') )</if>
+ <if test="typeId != null and typeId != ''"> and p.type_id like concat('%',#{typeId},'%')</if>
+ and p.sts='Y'
</trim>
- order by sorts asc
+ order by p.sorts asc
</select>
</mapper>
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/dao/ISysApplicationPluginTypeDao.java b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/dao/ISysApplicationPluginTypeDao.java
new file mode 100644
index 00000000..2578639c
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/dao/ISysApplicationPluginTypeDao.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.sysnew.application.pluginType.dao;
+
+import com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity;
+import com.hzya.frame.basedao.dao.IBaseDao;
+
+/**
+ * 插件类型表(sys_application_plugin_type: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-09-19 09:56:24
+ */
+public interface ISysApplicationPluginTypeDao extends IBaseDao<SysApplicationPluginTypeEntity, String> {
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/dao/impl/SysApplicationPluginTypeDaoImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/dao/impl/SysApplicationPluginTypeDaoImpl.java
new file mode 100644
index 00000000..78e7ac17
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/dao/impl/SysApplicationPluginTypeDaoImpl.java
@@ -0,0 +1,17 @@
+package com.hzya.frame.sysnew.application.pluginType.dao.impl;
+
+import com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity;
+import com.hzya.frame.sysnew.application.pluginType.dao.ISysApplicationPluginTypeDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 插件类型表(SysApplicationPluginType)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-09-19 09:56:24
+ */
+@Repository(value = "SysApplicationPluginTypeDaoImpl")
+public class SysApplicationPluginTypeDaoImpl extends MybatisGenericDao<SysApplicationPluginTypeEntity, String> implements ISysApplicationPluginTypeDao{
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/entity/SysApplicationPluginTypeEntity.java b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/entity/SysApplicationPluginTypeEntity.java
new file mode 100644
index 00000000..b8362993
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/entity/SysApplicationPluginTypeEntity.java
@@ -0,0 +1,25 @@
+package com.hzya.frame.sysnew.application.pluginType.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 插件类型表(SysApplicationPluginType)实体类
+ *
+ * @author makejava
+ * @since 2024-09-19 09:56:24
+ */
+public class SysApplicationPluginTypeEntity extends BaseEntity {
+
+ /** 插件类型名称 */
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+}
+
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/entity/SysApplicationPluginTypeEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/entity/SysApplicationPluginTypeEntity.xml
new file mode 100644
index 00000000..f48b07c9
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/entity/SysApplicationPluginTypeEntity.xml
@@ -0,0 +1,201 @@
+<?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.hzya.frame.sysnew.application.pluginType.dao.impl.SysApplicationPluginTypeDaoImpl">
+
+ <resultMap id="get-SysApplicationPluginTypeEntity-result" type="com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity" >
+ <result property="id" column="id" jdbcType="VARCHAR"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="sorts" column="sorts" jdbcType="INTEGER"/>
+ <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
+ <result property="sts" column="sts" jdbcType="VARCHAR"/>
+ <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+ <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+ <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+ </resultMap>
+ <!-- 查询的字段-->
+ <sql id = "SysApplicationPluginTypeEntity_Base_Column_List">
+ id
+ ,name
+ ,sorts
+ ,org_id
+ ,sts
+ ,create_time
+ ,create_user_id
+ ,modify_time
+ ,modify_user_id
+ </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-SysApplicationPluginTypeEntity-result" parameterType = "com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity">
+ select
+ <include refid="SysApplicationPluginTypeEntity_Base_Column_List" />
+ from sys_application_plugin_type
+ <trim prefix="where" prefixOverrides="and">
+ <if test="id != null and id != ''"> and id = #{id} </if>
+ <if test="name != null and name != ''"> and name = #{name} </if>
+ <if test="sorts != null"> and sorts = #{sorts} </if>
+ <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
+ <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+ <if test="create_time != null"> and create_time = #{create_time} </if>
+ <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+ <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+ <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+ and sts='Y'
+ </trim>
+ <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+ <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!-- 查询符合条件的数量 -->
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity">
+ select count(1) from sys_application_plugin_type
+ <trim prefix="where" prefixOverrides="and">
+ <if test="id != null and id != ''"> and id = #{id} </if>
+ <if test="name != null and name != ''"> and name = #{name} </if>
+ <if test="sorts != null"> and sorts = #{sorts} </if>
+ <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
+ <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+ <if test="create_time != null"> and create_time = #{create_time} </if>
+ <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+ <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+ <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+ and sts='Y'
+ </trim>
+ <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+ <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+ </select>
+
+ <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-SysApplicationPluginTypeEntity-result" parameterType = "com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity">
+ select
+ <include refid="SysApplicationPluginTypeEntity_Base_Column_List" />
+ from sys_application_plugin_type
+ <trim prefix="where" prefixOverrides="and">
+ <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+ <if test="name != null and name != ''"> and name like concat('%',#{name},'%') </if>
+ <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
+ <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
+ <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
+ <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
+ <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
+ <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
+ <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
+ and sts='Y'
+ </trim>
+ <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+ <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="SysApplicationPluginTypeentity_list_or" resultMap="get-SysApplicationPluginTypeEntity-result" parameterType = "com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity">
+ select
+ <include refid="SysApplicationPluginTypeEntity_Base_Column_List" />
+ from sys_application_plugin_type
+ <trim prefix="where" prefixOverrides="and">
+ <if test="id != null and id != ''"> or id = #{id} </if>
+ <if test="appId != null and appId != ''"> or app_id = #{appId} </if>
+ <if test="name != null and name != ''"> or name = #{name} </if>
+ <if test="sorts != null"> or sorts = #{sorts} </if>
+ <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
+ <if test="sts != null and sts != ''"> or sts = #{sts} </if>
+ <if test="create_time != null"> or create_time = #{create_time} </if>
+ <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
+ <if test="modify_time != null"> or modify_time = #{modify_time} </if>
+ <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
+ and sts='Y'
+ </trim>
+ <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+ <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity" keyProperty="id" useGeneratedKeys="true">
+ insert into sys_application_plugin_type(
+ <trim suffix="" suffixOverrides=",">
+ <if test="id != null and id != ''"> id , </if>
+ <if test="name != null and name != ''"> name , </if>
+ <if test="sorts != null"> sorts , </if>
+ <if test="org_id != null and org_id != ''"> org_id , </if>
+ <if test="sts != null and sts != ''"> sts , </if>
+ <if test="create_time != null"> create_time , </if>
+ <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
+ <if test="modify_time != null"> modify_time , </if>
+ <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
+ <if test="sts == null ">sts,</if>
+ </trim>
+ )values(
+ <trim suffix="" suffixOverrides=",">
+ <if test="id != null and id != ''"> #{id} ,</if>
+ <if test="name != null and name != ''"> #{name} ,</if>
+ <if test="sorts != null"> #{sorts} ,</if>
+ <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
+ <if test="sts != null and sts != ''"> #{sts} ,</if>
+ <if test="create_time != null"> #{create_time} ,</if>
+ <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
+ <if test="modify_time != null"> #{modify_time} ,</if>
+ <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
+ <if test="sts == null ">'Y',</if>
+ </trim>
+ )
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+ insert into sys_application_plugin_type(app_id, name, org_id, sts, create_time, create_user_id, modify_time, modify_user_id, sts)
+ values
+ <foreach collection="entities" item="entity" separator=",">
+ (#{entity.appId},#{entity.name},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id}, 'Y')
+ </foreach>
+</insert>
+<!-- 批量新增或者修改-->
+<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+ insert into sys_application_plugin_type(app_id, name, org_id, sts, create_time, create_user_id, modify_time, modify_user_id)
+ values
+ <foreach collection="entities" item="entity" separator=",">
+ (#{entity.appId},#{entity.name},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id})
+ </foreach>
+ on duplicate key update
+ app_id = values(app_id),
+ name = values(name),
+ org_id = values(org_id),
+ sts = values(sts),
+ create_time = values(create_time),
+ create_user_id = values(create_user_id),
+ modify_time = values(modify_time),
+ modify_user_id = values(modify_user_id)</insert>
+<!--通过主键修改方法-->
+<update id="entity_update" parameterType = "com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity" >
+update sys_application_plugin_type set
+<trim suffix="" suffixOverrides=",">
+ <if test="name != null and name != ''"> name = #{name},</if>
+ <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
+ <if test="sts != null and sts != ''"> sts = #{sts},</if>
+ <if test="create_time != null"> create_time = #{create_time},</if>
+ <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
+ <if test="modify_time != null"> modify_time = #{modify_time},</if>
+ <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
+ </trim>
+where id = #{id}
+</update>
+<!-- 逻辑删除 -->
+<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity" >
+update sys_application_plugin_type set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where id = #{id}
+</update>
+<!-- 多条件逻辑删除 -->
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity" >
+update sys_application_plugin_type set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+ <trim prefix="where" prefixOverrides="and">
+ <if test="id != null and id != ''"> and id = #{id} </if>
+ <if test="name != null and name != ''"> and name = #{name} </if>
+ <if test="sorts != null"> and sorts = #{sorts} </if>
+ <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+ and sts='Y'
+ </trim>
+</update>
+<!--通过主键删除-->
+<delete id="entity_delete">
+ delete from sys_application_plugin_type where id = #{id}
+</delete>
+
+</mapper>
+
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/service/ISysApplicationPluginTypeService.java b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/service/ISysApplicationPluginTypeService.java
new file mode 100644
index 00000000..dfee99d3
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/service/ISysApplicationPluginTypeService.java
@@ -0,0 +1,22 @@
+package com.hzya.frame.sysnew.application.pluginType.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/**
+ * 插件类型表(SysApplicationPluginType)表服务接口
+ *
+ * @author makejava
+ * @since 2024-09-19 09:56:24
+ */
+public interface ISysApplicationPluginTypeService extends IBaseService<SysApplicationPluginTypeEntity, String>{
+ JsonResultEntity queryPluginType(JSONObject jsonObject);
+
+ JsonResultEntity savePluginType(JSONObject jsonObject);
+
+ JsonResultEntity updatePluginType(JSONObject jsonObject);
+
+ JsonResultEntity deletePluginType(JSONObject jsonObject);
+}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/service/impl/SysApplicationPluginTypeServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/service/impl/SysApplicationPluginTypeServiceImpl.java
new file mode 100644
index 00000000..d6c00bc1
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/sysnew/application/pluginType/service/impl/SysApplicationPluginTypeServiceImpl.java
@@ -0,0 +1,106 @@
+package com.hzya.frame.sysnew.application.pluginType.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
+import com.hzya.frame.sysnew.application.plugin.dao.ISysApplicationPluginDao;
+import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity;
+import com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity;
+import com.hzya.frame.sysnew.application.pluginType.dao.ISysApplicationPluginTypeDao;
+import com.hzya.frame.sysnew.application.pluginType.service.ISysApplicationPluginTypeService;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 插件类型表(SysApplicationPluginType)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-09-19 09:56:24
+ */
+@Service(value = "sysApplicationPluginTypeService")
+public class SysApplicationPluginTypeServiceImpl extends BaseService<SysApplicationPluginTypeEntity, String> implements ISysApplicationPluginTypeService {
+
+ private ISysApplicationPluginTypeDao sysApplicationPluginTypeDao;
+
+ @Resource
+ private ISysApplicationPluginDao sysApplicationPluginDao;
+
+ @Autowired
+ public void setSysApplicationPluginTypeDao(ISysApplicationPluginTypeDao dao) {
+ this.sysApplicationPluginTypeDao = dao;
+ this.dao = dao;
+ }
+
+ @Override
+ public JsonResultEntity queryPluginType(JSONObject jsonObject){
+ SysApplicationPluginTypeEntity entity = getData("jsonStr", jsonObject, SysApplicationPluginTypeEntity.class);
+ if(entity == null){
+ entity = new SysApplicationPluginTypeEntity();
+ }
+ List<SysApplicationPluginTypeEntity> list = sysApplicationPluginTypeDao.queryByLike(entity);
+ return BaseResult.getSuccessMessageEntity("查询数据成功",list);
+ }
+
+ @Override
+ public JsonResultEntity savePluginType(JSONObject jsonObject) {
+ SysApplicationPluginTypeEntity entity = getData("jsonStr", jsonObject, SysApplicationPluginTypeEntity.class);
+ if(entity == null){
+ return BaseResult.getFailureMessageEntity("参数错误");
+ }
+ if(entity.getName() == null || "".equals(entity.getName())){
+ return BaseResult.getFailureMessageEntity("插件类型名称不能为空");
+ }
+ entity.setCreate();
+ sysApplicationPluginTypeDao.save(entity);
+ return BaseResult.getSuccessMessageEntity("保存数据成功",entity);
+ }
+
+ @Override
+ public JsonResultEntity updatePluginType(JSONObject jsonObject) {
+ SysApplicationPluginTypeEntity entity = getData("jsonStr", jsonObject, SysApplicationPluginTypeEntity.class);
+ if(entity == null){
+ return BaseResult.getFailureMessageEntity("参数错误");
+ }
+ if(entity.getId() == null || "".equals(entity.getId())){
+ return BaseResult.getFailureMessageEntity("ID不能为空");
+ }
+ if(entity.getName() == null || "".equals(entity.getName())){
+ return BaseResult.getFailureMessageEntity("插件类型名称不能为空");
+ }
+ entity.setUpdate();
+ sysApplicationPluginTypeDao.update(entity);
+ return BaseResult.getSuccessMessageEntity("更新数据成功",entity);
+ }
+
+ @Transactional
+ @Override
+ public JsonResultEntity deletePluginType(JSONObject jsonObject) {
+ SysApplicationPluginTypeEntity entity = getData("jsonStr", jsonObject, SysApplicationPluginTypeEntity.class);
+ if(entity == null){
+ return BaseResult.getFailureMessageEntity("参数错误");
+ }
+ if(entity.getId() == null || "".equals(entity.getId())){
+ return BaseResult.getFailureMessageEntity("ID不能为空");
+ }
+ // 同步删除匹配插件中的插件类型，将其赋值为null
+ SysApplicationPluginEntity pluginEntity = new SysApplicationPluginEntity();
+ pluginEntity.setTypeId(entity.getId());
+ List<SysApplicationPluginEntity> pluginList = sysApplicationPluginDao.queryBase(pluginEntity);
+ for(SysApplicationPluginEntity plugin : pluginList){
+ plugin.setTypeId("无");
+ plugin.setUpdate();
+ sysApplicationPluginDao.update(plugin);
+ }
+ entity.setUpdate();
+ sysApplicationPluginTypeDao.logicRemove(entity);
+ return BaseResult.getSuccessMessageEntity("删除数据成功");
+ }
+
+
+}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/warningConfig/service/impl/SysWarningConfigServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/warningConfig/service/impl/SysWarningConfigServiceImpl.java
index 541d44f1..32092216 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/warningConfig/service/impl/SysWarningConfigServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/warningConfig/service/impl/SysWarningConfigServiceImpl.java
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import com.hzya.frame.basedao.service.impl.BaseService;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -120,6 +121,7 @@ public class SysWarningConfigServiceImpl extends BaseService<SysWarningConfigEnt
return BaseResult.getSuccessMessageEntity("获取预警配置成功",resultJson);
}
+ @Transactional
@Override
public JsonResultEntity saveEntity(JSONObject jsonObject){
JSONObject jsonStr = jsonObject.getJSONObject("jsonStr");
@@ -178,6 +180,7 @@ public class SysWarningConfigServiceImpl extends BaseService<SysWarningConfigEnt
return BaseResult.getSuccessMessageEntity("保存预警配置成功",entity);
}
+ @Transactional
@Override
public JsonResultEntity updateEntity(JSONObject jsonObject){
JSONObject jsonStr = jsonObject.getJSONObject("jsonStr");
@@ -269,6 +272,7 @@ public class SysWarningConfigServiceImpl extends BaseService<SysWarningConfigEnt
/**
* 删除主表时，同时删除子表数据*/
+ @Transactional
@Override
public JsonResultEntity deleteEntity(JSONObject jsonObject) {
SysWarningConfigEntity entity = getData("jsonStr", jsonObject, SysWarningConfigEntity.class);