增加查询条件,3D模糊查询排除门窗

startJar.sh

@@ -49,7 +49,8 @@ start(){
     if [ $? -eq "0" ]; then    # [$? -eq "0"] 说明pid不等于空 说明服务正在运行中，将进程号打印出来
         echo "${APP_NAME} running. pid=${pid}"
     else
-        nohup java -jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${APP_DEBUG} $APP_NAME > logs.log 2>error.log &  # 说明pid为空 执行java -jar 命令启动服务
+        nohup java -jar -Xms1024m -Xmx1536m -XX:PermSize=128M -XX:MaxPermSize=256M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${APP_DEBUG} $APP_NAME > logs.log 2>error.log &  # 说明pid为空
+        # 执行java -jar 命令启动服务
         echo "${APP_NAME} started启动"
     fi
 }
@@ -96,7 +97,7 @@ restart(){
         if [ $? -eq "0" ]; then    # [$? -eq "0"] 说明pid不等于空 说明服务正在运行中，将进程号打印出来
             echo "${APP_NAME} running. pid=${pid}"
         else
-            nohup java -jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${APP_DEBUG} $APP_NAME > logs.log 2>error.log &  # 说明pid为空 执行java -jar 命令启动服务
+            nohup java -jar -Xms1024m -Xmx1536m -XX:PermSize=128M -XX:MaxPermSize=256M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${APP_DEBUG} $APP_NAME > logs.log 2>error.log &  # 说明pid为空 执行java -jar 命令启动服务
             echo "${APP_NAME} started启动"
         fi
 }

sxz-core/src/main/java/com/fdkk/sxz/webApi/mapper/IRenovationPartsDetailMapper.java

@@ -38,7 +38,7 @@ public interface IRenovationPartsDetailMapper extends IBaseMapper<RenovationPart
 
     @Select("select id,parts_type_id AS partsTypeId, key_word as keyWord, type, description, img, high_img as highImg, path, name, zh_name as zhName, has_toolbag as hasToolbag ,mview_path as " +
             "mviewPath ,other_file_url as  otherFileUrl from " +
-            "tb_renovation_parts_detail where key_word like CONCAT('%', #{keyWord}, '%') and rec_status = 'A' and is_show = 1 and examine = 1 and mview_status in (0,2)  ")
+            "tb_renovation_parts_detail where key_word like CONCAT('%', #{keyWord}, '%') and rec_status = 'A' and is_show = 1 and examine = 1 and mview_status in (0,2) and is_3d_show =1  ")
     List<ResponseRenovationPartsDetail> findByKeyWord(String keyWord);
 
     @Select("<script> " +

sxz-modules/src/main/java/com/fdkk/sxz/entity/RenovationPartsDetailEntity.java

@@ -77,6 +77,10 @@ public class RenovationPartsDetailEntity extends BaseEntity {
     @TableField("mview_status")
     private Integer mviewStatus;
 
+    //列表查询是3d的时候查能查询到此类型 0 隐藏 1显示
+    @TableField("is_3d_show")
+    private Integer is3dShow;
+
     @TableField("other_file_url")
     private String otherFileUrl;