feat: 数据库修改

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraSmsConfigDTO.java

@@ -148,6 +148,16 @@ public class SchisandraSmsConfigDTO implements Serializable {
      * 签名ID
      */
     private String signatureId;
+    /**
+     * 是否删除 0 未删除 1已删除
+     */
+    private Integer isDeleted;
+
+    private String extraJson;
+    /**
+     * 服务名
+     */
+    private String service;
 
 
 

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSmsConfigBO.java

@@ -148,6 +148,16 @@ public class SchisandraSmsConfigBO implements Serializable {
      * 签名ID
      */
     private String signatureId;
+    /**
+     * 是否删除 0 未删除 1已删除
+     */
+    private Integer isDeleted;
+
+    private String extraJson;
+    /**
+     * 服务名
+     */
+    private String service;
 
 
 

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java

@@ -10,7 +10,7 @@ import java.util.List;
  * (SchisandraSmsConfig)表数据库访问层
  *
  * @author makejava
- * @since 2024-05-08 20:09:54
+ * @since 2024-05-11 15:47:58
  */
 public interface SchisandraSmsConfigDao {
 
@@ -31,8 +31,6 @@ public interface SchisandraSmsConfigDao {
      */
     List<SchisandraSmsConfig> queryAllByLimit(SchisandraSmsConfig schisandraSmsConfig, @Param("pageable") Pageable pageable);
 
-    List<SchisandraSmsConfig> queryAll();
-
     /**
      * 统计总行数
      *
@@ -82,5 +80,6 @@ public interface SchisandraSmsConfigDao {
      */
     int deleteById(Integer id);
 
+    List<SchisandraSmsConfig> queryAll();
 }
 

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraSmsConfig.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
  * (SchisandraSmsConfig)实体类
  *
  * @author makejava
- * @since 2024-05-08 20:09:54
+ * @since 2024-05-11 15:47:59
  */
 @Data
 public class SchisandraSmsConfig implements Serializable {
@@ -169,6 +169,11 @@ public class SchisandraSmsConfig implements Serializable {
      */
     private Integer isDeleted;
 
+    private String extraJson;
+    /**
+     * 服务名
+     */
+    private String service;
 
 }
 

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java

@@ -10,7 +10,7 @@ import java.util.List;
  * (SchisandraSmsConfig)表服务接口
  *
  * @author makejava
- * @since 2024-05-08 20:09:55
+ * @since 2024-05-11 15:48:02
  */
 public interface SchisandraSmsConfigService {
 
@@ -22,8 +22,6 @@ public interface SchisandraSmsConfigService {
      */
     SchisandraSmsConfig queryById(Integer id);
 
-    List<SchisandraSmsConfig> queryAll();
-
     /**
      * 分页查询
      *
@@ -57,4 +55,5 @@ public interface SchisandraSmsConfigService {
      */
     boolean deleteById(Integer id);
 
+    List<SchisandraSmsConfig> queryAll();
 }

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
  * (SchisandraSmsConfig)表服务实现类
  *
  * @author makejava
- * @since 2024-05-08 20:09:55
+ * @since 2024-05-11 15:48:03
  */
 @Service("schisandraSmsConfigService")
 public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigService {
@@ -46,11 +46,6 @@ public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigServic
         return new PageImpl<>(this.schisandraSmsConfigDao.queryAllByLimit(schisandraSmsConfig, pageRequest), pageRequest, total);
     }
 
-    @Override
-    public List<SchisandraSmsConfig> queryAll() {
-        return this.schisandraSmsConfigDao.queryAll();
-    }
-
     /**
      * 新增数据
      *
@@ -85,4 +80,9 @@ public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigServic
     public boolean deleteById(Integer id) {
         return this.schisandraSmsConfigDao.deleteById(id) > 0;
     }
+
+    @Override
+    public List<SchisandraSmsConfig> queryAll() {
+        return schisandraSmsConfigDao.queryAll();
+    }
 }

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml

@@ -44,24 +44,21 @@
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
         <result property="isDeleted" column="is_deleted" jdbcType="INTEGER"/>
+        <result property="extraJson" column="extra_json" jdbcType="VARCHAR"/>
+        <result property="service" column="service" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="queryById" resultMap="SchisandraSmsConfigMap">
-        select id,config_id,request_url,template_name,'action',region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted
+        select id,config_id,request_url,template_name,`action`,region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted,extra_json,service
         from schisandra_sms_config
         where id = #{id}
     </select>
-    <select id="queryAll" resultMap="SchisandraSmsConfigMap">
-        select
-        id,config_id,request_url,template_name,'action',region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted
-        from schisandra_sms_config
-    </select>
 
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="SchisandraSmsConfigMap">
         select
-        id,config_id,request_url,template_name,'action',region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted
+        id,config_id,request_url,template_name,`action`,region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted,extra_json,service
         from schisandra_sms_config
         <where>
             <if test="id != null">
@@ -77,7 +74,7 @@
                 and template_name = #{templateName}
             </if>
             <if test="action != null and action != ''">
-                and 'action' = #{action}
+                and `action` = #{action}
             </if>
             <if test="region != null and region != ''">
                 and region = #{region}
@@ -187,6 +184,12 @@
             <if test="isDeleted != null">
                 and is_deleted = #{isDeleted}
             </if>
+            <if test="extraJson != null and extraJson != ''">
+                and extra_json = #{extraJson}
+            </if>
+            <if test="service != null and service != ''">
+                and service = #{service}
+            </if>
         </where>
         limit #{pageable.offset}, #{pageable.pageSize}
     </select>
@@ -209,7 +212,7 @@
                 and template_name = #{templateName}
             </if>
             <if test="action != null and action != ''">
-                and 'action' = #{action}
+                and action = #{action}
             </if>
             <if test="region != null and region != ''">
                 and region = #{region}
@@ -319,30 +322,44 @@
             <if test="isDeleted != null">
                 and is_deleted = #{isDeleted}
             </if>
+            <if test="extraJson != null and extraJson != ''">
+                and extra_json = #{extraJson}
+            </if>
+            <if test="service != null and service != ''">
+                and service = #{service}
+            </if>
         </where>
     </select>
+    <select id="queryAll" resultMap="SchisandraSmsConfigMap">
+        select *
+        from schisandra_sms_config
+        where is_deleted = 0
+    </select>
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into schisandra_sms_config(config_id,request_url,template_name,'action',region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted)
+        insert into schisandra_sms_config(config_id,request_url,template_name,action,region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted,extra_json,service
-        values (#{configId},#{requestUrl},#{templateName},#{action},#{region},#{accessKeyId},#{accessKeySecret},#{supplier},#{signature},#{sdkAppId},#{templateId},#{weight},#{retryInterval},#{maxRetries},#{maximum},#{baseUrl},#{serverIp},#{serverPort},#{sender},#{statusCallBack},#{url},#{templateUrl},#{codeUrl},#{verifyUrl},#{needUp},#{connTimeout},#{isSimple},#{callbackUrl},#{mchId},#{appKey},#{appId},#{version},#{singleMsgUrl},#{massMsgUrl},#{signatureId},#{createdBy},#{createdTime},#{updateTime},#{updateBy},#{isDeleted})
+        )
+        values (#{configId},#{requestUrl},#{templateName},#{action},#{region},#{accessKeyId},#{accessKeySecret},#{supplier},#{signature},#{sdkAppId},#{templateId},#{weight},#{retryInterval},#{maxRetries},#{maximum},#{baseUrl},#{serverIp},#{serverPort},#{sender},#{statusCallBack},#{url},#{templateUrl},#{codeUrl},#{verifyUrl},#{needUp},#{connTimeout},#{isSimple},#{callbackUrl},#{mchId},#{appKey},#{appId},#{version},#{singleMsgUrl},#{massMsgUrl},#{signatureId},#{createdBy},#{createdTime},#{updateTime},#{updateBy},#{isDeleted},#{extraJson},#{service})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
         insert into
-        schisandra_sms_config(config_id,request_url,template_name,'action',region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted)
+        schisandra_sms_config(config_id,request_url,template_name,action,region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted,extra_json,service
+        )
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.configId},#{entity.requestUrl},#{entity.templateName},#{entity.action},#{entity.region},#{entity.accessKeyId},#{entity.accessKeySecret},#{entity.supplier},#{entity.signature},#{entity.sdkAppId},#{entity.templateId},#{entity.weight},#{entity.retryInterval},#{entity.maxRetries},#{entity.maximum},#{entity.baseUrl},#{entity.serverIp},#{entity.serverPort},#{entity.sender},#{entity.statusCallBack},#{entity.url},#{entity.templateUrl},#{entity.codeUrl},#{entity.verifyUrl},#{entity.needUp},#{entity.connTimeout},#{entity.isSimple},#{entity.callbackUrl},#{entity.mchId},#{entity.appKey},#{entity.appId},#{entity.version},#{entity.singleMsgUrl},#{entity.massMsgUrl},#{entity.signatureId},#{entity.createdBy},#{entity.createdTime},#{entity.updateTime},#{entity.updateBy},#{entity.isDeleted})
+            (#{entity.configId},#{entity.requestUrl},#{entity.templateName},#{entity.action},#{entity.region},#{entity.accessKeyId},#{entity.accessKeySecret},#{entity.supplier},#{entity.signature},#{entity.sdkAppId},#{entity.templateId},#{entity.weight},#{entity.retryInterval},#{entity.maxRetries},#{entity.maximum},#{entity.baseUrl},#{entity.serverIp},#{entity.serverPort},#{entity.sender},#{entity.statusCallBack},#{entity.url},#{entity.templateUrl},#{entity.codeUrl},#{entity.verifyUrl},#{entity.needUp},#{entity.connTimeout},#{entity.isSimple},#{entity.callbackUrl},#{entity.mchId},#{entity.appKey},#{entity.appId},#{entity.version},#{entity.singleMsgUrl},#{entity.massMsgUrl},#{entity.signatureId},#{entity.createdBy},#{entity.createdTime},#{entity.updateTime},#{entity.updateBy},#{entity.isDeleted},#{entity.extraJson},#{entity.service})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
         insert into
-        schisandra_sms_config(config_id,request_url,template_name,'action',region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted)
+        schisandra_sms_config(config_id,request_url,template_name,action,region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted,extra_json,service
+        )
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.configId},#{entity.requestUrl},#{entity.templateName},#{entity.action},#{entity.region},#{entity.accessKeyId},#{entity.accessKeySecret},#{entity.supplier},#{entity.signature},#{entity.sdkAppId},#{entity.templateId},#{entity.weight},#{entity.retryInterval},#{entity.maxRetries},#{entity.maximum},#{entity.baseUrl},#{entity.serverIp},#{entity.serverPort},#{entity.sender},#{entity.statusCallBack},#{entity.url},#{entity.templateUrl},#{entity.codeUrl},#{entity.verifyUrl},#{entity.needUp},#{entity.connTimeout},#{entity.isSimple},#{entity.callbackUrl},#{entity.mchId},#{entity.appKey},#{entity.appId},#{entity.version},#{entity.singleMsgUrl},#{entity.massMsgUrl},#{entity.signatureId},#{entity.createdBy},#{entity.createdTime},#{entity.updateTime},#{entity.updateBy},#{entity.isDeleted})
+            (#{entity.configId},#{entity.requestUrl},#{entity.templateName},#{entity.action},#{entity.region},#{entity.accessKeyId},#{entity.accessKeySecret},#{entity.supplier},#{entity.signature},#{entity.sdkAppId},#{entity.templateId},#{entity.weight},#{entity.retryInterval},#{entity.maxRetries},#{entity.maximum},#{entity.baseUrl},#{entity.serverIp},#{entity.serverPort},#{entity.sender},#{entity.statusCallBack},#{entity.url},#{entity.templateUrl},#{entity.codeUrl},#{entity.verifyUrl},#{entity.needUp},#{entity.connTimeout},#{entity.isSimple},#{entity.callbackUrl},#{entity.mchId},#{entity.appKey},#{entity.appId},#{entity.version},#{entity.singleMsgUrl},#{entity.massMsgUrl},#{entity.signatureId},#{entity.createdBy},#{entity.createdTime},#{entity.updateTime},#{entity.updateBy},#{entity.isDeleted},#{entity.extraJson},#{entity.service})
         </foreach>
         on duplicate key update
         config_id = values(config_id)request_url = values(request_url)template_name = values(template_name)action =
@@ -357,7 +374,8 @@
         values(callback_url)mch_id = values(mch_id)app_key = values(app_key)app_id = values(app_id)version =
         values(version)single_msg_url = values(single_msg_url)mass_msg_url = values(mass_msg_url)signature_Id =
         values(signature_Id)created_by = values(created_by)created_time = values(created_time)update_time =
-        values(update_time)update_by = values(update_by)is_deleted = values(is_deleted)
+        values(update_time)update_by = values(update_by)is_deleted = values(is_deleted)extra_json =
+        values(extra_json)service = values(service)
     </insert>
 
     <!--通过主键修改数据-->
@@ -374,7 +392,7 @@
                 template_name = #{templateName},
             </if>
             <if test="action != null and action != ''">
-                `action` = #{action},
+                action = #{action},
             </if>
             <if test="region != null and region != ''">
                 region = #{region},
@@ -484,6 +502,12 @@
             <if test="isDeleted != null">
                 is_deleted = #{isDeleted},
             </if>
+            <if test="extraJson != null and extraJson != ''">
+                extra_json = #{extraJson},
+            </if>
+            <if test="service != null and service != ''">
+                service = #{service},
+            </if>
         </set>
         where id = #{id}
     </update>