知识库代码调整

knowledge-base/src/main/java/com/mortals/xhx/module/error/model/ErrorRecoveryEntity.java

@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.error.model.vo.ErrorRecoveryVo;
 /**
-* 纠错管理实体对象
-*
-* @author zxfei
-* @date 2023-03-01
-*/
+ * 纠错管理实体对象
+ *
+ * @author zxfei
+ * @date 2023-03-13
+ */
 
 public class ErrorRecoveryEntity extends ErrorRecoveryVo {
     private static final long serialVersionUID = 1L;
@@ -29,6 +29,10 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
      * 事件位置
      */
     private String matterSite;
+    /**
+     * 关联事项名称
+     */
+    private String matterName;
     /**
      * 具体内容
      */
@@ -115,6 +119,20 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
     public void setMatterSite(String matterSite){
         this.matterSite = matterSite;
     }
+    /**
+     * 获取 关联事项名称
+     * @return String
+     */
+    public String getMatterName(){
+        return matterName;
+    }
+    /**
+     * 设置 关联事项名称
+     * @param matterName
+     */
+    public void setMatterName(String matterName){
+        this.matterName = matterName;
+    }
     /**
      * 获取 具体内容
      * @return String
@@ -280,6 +298,7 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
         sb.append(",siteId:").append(getSiteId());
         sb.append(",errorTitle:").append(getErrorTitle());
         sb.append(",matterSite:").append(getMatterSite());
+        sb.append(",matterName:").append(getMatterName());
         sb.append(",substance:").append(getSubstance());
         sb.append(",annexUrl:").append(getAnnexUrl());
         sb.append(",formalReply:").append(getFormalReply());
@@ -301,6 +320,8 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
 
         this.matterSite = "";
 
+        this.matterName = "";
+
         this.substance = "1";
 
         this.annexUrl = "";

knowledge-base/src/main/java/com/mortals/xhx/module/error/model/ErrorRecoveryQuery.java

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.error.model.ErrorRecoveryEntity;
 /**
-* 纠错管理查询对象
-*
-* @author zxfei
-* @date 2023-03-01
-*/
+ * 纠错管理查询对象
+ *
+ * @author zxfei
+ * @date 2023-03-13
+ */
 public class ErrorRecoveryQuery extends ErrorRecoveryEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -50,6 +50,11 @@ public class ErrorRecoveryQuery extends ErrorRecoveryEntity {
 
     /** 事件位置排除列表 */
     private List <String> matterSiteNotList;
+    /** 关联事项名称 */
+    private List<String> matterNameList;
+
+    /** 关联事项名称排除列表 */
+    private List <String> matterNameNotList;
     /** 具体内容 */
     private List<String> substanceList;
 
@@ -408,6 +413,38 @@ public class ErrorRecoveryQuery extends ErrorRecoveryEntity {
         this.matterSiteNotList = matterSiteNotList;
     }
 
+    /**
+     * 获取 关联事项名称
+     * @return matterNameList
+     */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+     * 设置 关联事项名称
+     * @param matterNameList
+     */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+
+    /**
+     * 获取 关联事项名称
+     * @return matterNameNotList
+     */
+    public List<String> getMatterNameNotList(){
+        return this.matterNameNotList;
+    }
+
+    /**
+     * 设置 关联事项名称
+     * @param matterNameNotList
+     */
+    public void setMatterNameNotList(List<String> matterNameNotList){
+        this.matterNameNotList = matterNameNotList;
+    }
+
     /**
      * 获取 具体内容
      * @return substanceList
@@ -1248,6 +1285,25 @@ public class ErrorRecoveryQuery extends ErrorRecoveryEntity {
     }
 
 
+    /**
+     * 设置 关联事项名称
+     * @param matterName
+     */
+    public ErrorRecoveryQuery matterName(String matterName){
+        setMatterName(matterName);
+        return this;
+    }
+
+    /**
+     * 设置 关联事项名称
+     * @param matterNameList
+     */
+    public ErrorRecoveryQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+        return this;
+    }
+
+
     /**
      * 设置 具体内容
      * @param substance

knowledge-base/src/main/java/com/mortals/xhx/module/user/model/UserCollectEntity.java

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.user.model.vo.UserCollectVo;
 /**
-* 用户收藏夹实体对象
-*
-* @author zxfei
-* @date 2023-03-09
-*/
+ * 用户收藏夹实体对象
+ *
+ * @author zxfei
+ * @date 2023-03-13
+ */
 
 public class UserCollectEntity extends UserCollectVo {
     private static final long serialVersionUID = 1L;
@@ -32,6 +32,10 @@ public class UserCollectEntity extends UserCollectVo {
      * 收藏链接
      */
     private String collectUrl;
+    /**
+     * 收藏关联业务id
+     */
+    private String businessId;
 
 
 
@@ -92,6 +96,20 @@ public class UserCollectEntity extends UserCollectVo {
     public void setCollectUrl(String collectUrl){
         this.collectUrl = collectUrl;
     }
+    /**
+     * 获取 收藏关联业务id
+     * @return String
+     */
+    public String getBusinessId(){
+        return businessId;
+    }
+    /**
+     * 设置 收藏关联业务id
+     * @param businessId
+     */
+    public void setBusinessId(String businessId){
+        this.businessId = businessId;
+    }
 
 
 
@@ -118,6 +136,7 @@ public class UserCollectEntity extends UserCollectVo {
         sb.append(",collectType:").append(getCollectType());
         sb.append(",collectName:").append(getCollectName());
         sb.append(",collectUrl:").append(getCollectUrl());
+        sb.append(",businessId:").append(getBusinessId());
         return sb.toString();
     }
 
@@ -130,5 +149,7 @@ public class UserCollectEntity extends UserCollectVo {
         this.collectName = "";
 
         this.collectUrl = "";
+
+        this.businessId = "";
     }
 }
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/user/model/UserCollectQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.user.model;
 import java.util.List;
 import com.mortals.xhx.module.user.model.UserCollectEntity;
 /**
-* 用户收藏夹查询对象
-*
-* @author zxfei
-* @date 2023-03-09
-*/
+ * 用户收藏夹查询对象
+ *
+ * @author zxfei
+ * @date 2023-03-13
+ */
 public class UserCollectQuery extends UserCollectEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -64,6 +64,11 @@ public class UserCollectQuery extends UserCollectEntity {
 
     /** 收藏链接排除列表 */
     private List <String> collectUrlNotList;
+    /** 收藏关联业务id */
+    private List<String> businessIdList;
+
+    /** 收藏关联业务id排除列表 */
+    private List <String> businessIdNotList;
     /** 开始 创建用户 */
     private Long createUserIdStart;
 
@@ -421,6 +426,38 @@ public class UserCollectQuery extends UserCollectEntity {
         this.collectUrlNotList = collectUrlNotList;
     }
 
+    /**
+     * 获取 收藏关联业务id
+     * @return businessIdList
+     */
+    public List<String> getBusinessIdList(){
+        return this.businessIdList;
+    }
+
+    /**
+     * 设置 收藏关联业务id
+     * @param businessIdList
+     */
+    public void setBusinessIdList(List<String> businessIdList){
+        this.businessIdList = businessIdList;
+    }
+
+    /**
+     * 获取 收藏关联业务id
+     * @return businessIdNotList
+     */
+    public List<String> getBusinessIdNotList(){
+        return this.businessIdNotList;
+    }
+
+    /**
+     * 设置 收藏关联业务id
+     * @param businessIdNotList
+     */
+    public void setBusinessIdNotList(List<String> businessIdNotList){
+        this.businessIdNotList = businessIdNotList;
+    }
+
     /**
      * 获取 开始 创建用户
      * @return createUserIdStart
@@ -847,6 +884,25 @@ public class UserCollectQuery extends UserCollectEntity {
         return this;
     }
 
+
+    /**
+     * 设置 收藏关联业务id
+     * @param businessId
+     */
+    public UserCollectQuery businessId(String businessId){
+        setBusinessId(businessId);
+        return this;
+    }
+
+    /**
+     * 设置 收藏关联业务id
+     * @param businessIdList
+     */
+    public UserCollectQuery businessIdList(List<String> businessIdList){
+        this.businessIdList = businessIdList;
+        return this;
+    }
+
     /**
      * 设置  创建用户
      * @param createUserId

knowledge-base/src/main/resources/bootstrap.yml

@@ -16,12 +16,6 @@ spring:
     default-property-inclusion: NON_NULL
   #    time-zone: GMT+8
   #    date-format: yyyy-MM-dd HH:mm:ss
-  rabbitmq:
-    host: @profiles.rabbitmq.host@
-    port: @profiles.rabbitmq.port@
-    username: @profiles.rabbitmq.username@
-    password: @profiles.rabbitmq.password@
-    virtualHost: @profiles.rabbitmq.virtualhost@
   dao:
     exceptiontranslation:
       enabled: false

knowledge-base/src/main/resources/sqlmap/module/error/ErrorRecoveryMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.error.dao.ibatis.ErrorRecoveryDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -9,6 +9,7 @@
         <result property="siteId" column="siteId" />
         <result property="errorTitle" column="errorTitle" />
         <result property="matterSite" column="matterSite" />
+        <result property="matterName" column="matterName" />
         <result property="substance" column="substance" />
         <result property="annexUrl" column="annexUrl" />
         <result property="formalReply" column="formalReply" />
@@ -42,6 +43,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterSite') or colPickMode == 1 and data.containsKey('matterSite')))">
                 a.matterSite,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
+                a.matterName,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('substance') or colPickMode == 1 and data.containsKey('substance')))">
                 a.substance,
             </if>
@@ -89,18 +93,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="ErrorRecoveryEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_error_recovery
-        (siteId,errorTitle,matterSite,substance,annexUrl,formalReply,submitUserId,submitUserName,submitDate,status,answerUserId,answerUserName,answerDate,createUserId,createTime,updateUserId,updateTime)
+        (siteId,errorTitle,matterSite,matterName,substance,annexUrl,formalReply,submitUserId,submitUserName,submitDate,status,answerUserId,answerUserName,answerDate,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{siteId},#{errorTitle},#{matterSite},#{substance},#{annexUrl},#{formalReply},#{submitUserId},#{submitUserName},#{submitDate},#{status},#{answerUserId},#{answerUserName},#{answerDate},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{siteId},#{errorTitle},#{matterSite},#{matterName},#{substance},#{annexUrl},#{formalReply},#{submitUserId},#{submitUserName},#{submitDate},#{status},#{answerUserId},#{answerUserName},#{answerDate},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_error_recovery
-        (siteId,errorTitle,matterSite,substance,annexUrl,formalReply,submitUserId,submitUserName,submitDate,status,answerUserId,answerUserName,answerDate,createUserId,createTime,updateUserId,updateTime)
+        (siteId,errorTitle,matterSite,matterName,substance,annexUrl,formalReply,submitUserId,submitUserName,submitDate,status,answerUserId,answerUserName,answerDate,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.errorTitle},#{item.matterSite},#{item.substance},#{item.annexUrl},#{item.formalReply},#{item.submitUserId},#{item.submitUserName},#{item.submitDate},#{item.status},#{item.answerUserId},#{item.answerUserName},#{item.answerDate},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.siteId},#{item.errorTitle},#{item.matterSite},#{item.matterName},#{item.substance},#{item.annexUrl},#{item.formalReply},#{item.submitUserId},#{item.submitUserName},#{item.submitDate},#{item.status},#{item.answerUserId},#{item.answerUserName},#{item.answerDate},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -122,6 +126,9 @@
             <if test="(colPickMode==0 and data.containsKey('matterSite')) or (colPickMode==1 and !data.containsKey('matterSite'))">
                 a.matterSite=#{data.matterSite},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
+                a.matterName=#{data.matterName},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('substance')) or (colPickMode==1 and !data.containsKey('substance'))">
                 a.substance=#{data.substance},
             </if>
@@ -217,6 +224,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="matterName=(case" suffix="ELSE matterName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
+                        when a.id=#{item.id} then #{item.matterName}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="substance=(case" suffix="ELSE substance end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('substance')) or (colPickMode==1 and !item.containsKey('substance'))">
@@ -553,6 +567,27 @@
             </foreach>
         </if>
 
+        <if test="conditionParamRef.containsKey('matterName')">
+            <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+                ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
+            </if>
+            <if test="conditionParamRef.matterName == null">
+                ${_conditionType_} a.matterName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('matterNameList')">
+            ${_conditionType_} a.matterName in
+            <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('matterNameNotList')">
+            ${_conditionType_} a.matterName not in
+            <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="conditionParamRef.containsKey('substance')">
             <if test="conditionParamRef.substance != null and conditionParamRef.substance != ''">
                 ${_conditionType_} a.substance like #{${_conditionParam_}.substance}
@@ -885,6 +920,11 @@
                     <if test='orderCol.matterSite != null and "DESC".equalsIgnoreCase(orderCol.matterSite)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('matterName')">
+                    a.matterName
+                    <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('substance')">
                     a.substance
                     <if test='orderCol.substance != null and "DESC".equalsIgnoreCase(orderCol.substance)'>DESC</if>

knowledge-base/src/main/resources/sqlmap/module/user/UserCollectMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.user.dao.ibatis.UserCollectDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -10,6 +10,7 @@
         <result property="collectType" column="collectType" />
         <result property="collectName" column="collectName" />
         <result property="collectUrl" column="collectUrl" />
+        <result property="businessId" column="businessId" />
         <result property="createUserId" column="createUserId" />
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
@@ -36,6 +37,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('collectUrl') or colPickMode == 1 and data.containsKey('collectUrl')))">
                 a.collectUrl,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('businessId') or colPickMode == 1 and data.containsKey('businessId')))">
+                a.businessId,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
                 a.createUserId,
             </if>
@@ -53,18 +57,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="UserCollectEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_user_collect
-        (userId,collectType,collectName,collectUrl,createUserId,createTime,updateUserId,updateTime)
+        (userId,collectType,collectName,collectUrl,businessId,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{userId},#{collectType},#{collectName},#{collectUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{userId},#{collectType},#{collectName},#{collectUrl},#{businessId},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_user_collect
-        (userId,collectType,collectName,collectUrl,createUserId,createTime,updateUserId,updateTime)
+        (userId,collectType,collectName,collectUrl,businessId,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.userId},#{item.collectType},#{item.collectName},#{item.collectUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.userId},#{item.collectType},#{item.collectName},#{item.collectUrl},#{item.businessId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -92,6 +96,9 @@
             <if test="(colPickMode==0 and data.containsKey('collectUrl')) or (colPickMode==1 and !data.containsKey('collectUrl'))">
                 a.collectUrl=#{data.collectUrl},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('businessId')) or (colPickMode==1 and !data.containsKey('businessId'))">
+                a.businessId=#{data.businessId},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
                 a.createUserId=#{data.createUserId},
             </if>
@@ -160,6 +167,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="businessId=(case" suffix="ELSE businessId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('businessId')) or (colPickMode==1 and !item.containsKey('businessId'))">
+                        when a.id=#{item.id} then #{item.businessId}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -437,6 +451,27 @@
                 #{item}
             </foreach>
         </if>
+
+        <if test="conditionParamRef.containsKey('businessId')">
+            <if test="conditionParamRef.businessId != null and conditionParamRef.businessId != ''">
+                ${_conditionType_} a.businessId like #{${_conditionParam_}.businessId}
+            </if>
+            <if test="conditionParamRef.businessId == null">
+                ${_conditionType_} a.businessId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('businessIdList')">
+            ${_conditionType_} a.businessId in
+            <foreach collection="conditionParamRef.businessIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('businessIdNotList')">
+            ${_conditionType_} a.businessId not in
+            <foreach collection="conditionParamRef.businessIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('createUserId')">
             <if test="conditionParamRef.createUserId != null ">
                 ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
@@ -559,6 +594,11 @@
                     <if test='orderCol.collectUrl != null and "DESC".equalsIgnoreCase(orderCol.collectUrl)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('businessId')">
+                    a.businessId
+                    <if test='orderCol.businessId != null and "DESC".equalsIgnoreCase(orderCol.businessId)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('createUserId')">
                     a.createUserId
                     <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>