d代码修改更新27

.idea/uiDesigner.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file

zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/common/util/BlobTypeHandler.java

+package com.zzsn.common.util;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.io.*;
+import java.sql.*;
+
+
+/**
+ * BLOB类型转换器
+ * 创建人：李东亮
+ * 创建时间：2015-5-30 下午2:28:19
+ * 公司 ：郑州数能软件科技有限公司
+ * @version  1.0
+ *
+ */
+//@MappedJdbcTypes(JdbcType.BLOB) // 声明数据库中对应数据类型
+//@MappedTypes(value = String.class)
+public class BlobTypeHandler extends BaseTypeHandler<String> {
+    @Override
+    public String getNullableResult(ResultSet rs, String columnName)
+            throws SQLException {
+        // TODO Auto-generated method stub
+        Blob blob = rs.getBlob(columnName);
+        if(blob==null){
+            return null;
+        }
+        return this.readBlob(blob, "UTF-8" );
+    }
+
+    @Override
+    public String getNullableResult(ResultSet rs, int columnIndex)
+            throws SQLException {
+        // TODO Auto-generated method stub
+        Blob blob = rs.getBlob(columnIndex);
+        String charset = rs.getString("charset");
+        if(charset==null){
+            charset = "UTF-8";
+        }
+        return this.readBlob(blob,charset);
+    }
+
+    @Override
+    public String getNullableResult(CallableStatement cs, int columnIndex)
+            throws SQLException {
+        // TODO Auto-generated method stub
+        Blob blob  = cs.getBlob(columnIndex);
+        if(blob==null){
+            return null;
+        }
+        return this.readBlob(blob, cs.getString("charset"));
+    }
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int columnIndex,
+                                    String content, JdbcType jdbcType) throws SQLException {
+        // TODO Auto-generated method stub
+        try {
+            ps.setBlob(columnIndex, new ByteArrayInputStream(content.getBytes("UTF-8")));
+        } catch (UnsupportedEncodingException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+    /**
+     * 获取blob字段值
+     * 创建人:  李东亮
+     * 创建时间:  2015-5-28 上午9:40:21
+     * @version 1.0
+     * @param blob
+     * @return
+     */
+    private  String readBlob(Blob blob,String charset){
+
+        StringBuffer result = new StringBuffer();
+        if (blob != null) {
+            try {
+                InputStream input = blob.getBinaryStream();
+                BufferedReader br = new BufferedReader(new InputStreamReader(
+                        input,"UTF-8"));
+                char[] buffer = new char[256];
+                int length = -1;
+                while ((length = br.read(buffer)) != -1) {
+                    result.append(new String(buffer,0,length));
+                }
+			/*	byte[] buffer = new byte[512];
+				int length = -1;
+				while((length=input.read(buffer))!=-1){
+				    result.append();
+				}*/
+            } catch (SQLException | IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+        return result.toString();
+
+    }
+
+    public static void main(String[] args) {
+    }
+
+}

zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/controller/FileController.java

 package com.zzsn.modules.kgj.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zzsn.modules.kgj.common.ResultModel;
 import com.zzsn.modules.kgj.entity.BaseDataImage;
+import com.zzsn.modules.kgj.entity.SiteType;
 import com.zzsn.modules.kgj.mapper.BaseDataImageMapper;
 import com.zzsn.modules.kgj.utils.DateUtil;
 import com.zzsn.modules.kgj.utils.FileValidateUtil;
@@ -10,17 +14,25 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.util.DigestUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 图片上传访问
@@ -32,9 +44,68 @@ public class FileController {
     @Autowired
     private BaseDataImageMapper imageMapper;
 
+    @Autowired
+    RestTemplate restTemplate;
+
+    @Value("paserUrl")
+    String paserUrl;
+
     // 允许上传图片的格式
     private static final String[] IMAGE_TYPE = new String[] { ".gif", ".jpeg", ".bmp", ".jpg", ".png" };
 
+    /**
+     * 视频图片解析
+     * id
+     * type
+     * content
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "视频图片解析")
+    @PostMapping(value="/paserMsg")
+    public ResultModel paserMsg(@RequestParam("bid") String bid,
+                                HttpServletRequest req) throws IOException {
+
+
+        QueryWrapper<BaseDataImage> wrapper = new QueryWrapper<>();
+        wrapper.eq("bid", bid);
+        List<BaseDataImage> baseDataImages = imageMapper.selectList(wrapper);
+        for (BaseDataImage baseDataImage :
+                baseDataImages) {
+            String fileId= baseDataImage.getId();
+            String dataImage = baseDataImage.getDataImage();
+            String type="";
+            if(dataImage.contains("mp4")){
+                type="video";
+            }else if(dataImage.contains("mp3")){
+                type="video";
+            }else {
+                type="image";
+            }
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            String parmas = "{ \"type\": \""+type+"\",\"filePath\": \""+dataImage+"\",\"fileId\":" +fileId+"\"}";
+            HttpEntity<String> request = new HttpEntity<>(parmas, headers);
+            try {
+                ResponseEntity<String> response = restTemplate.postForEntity(paserUrl, request, String.class);
+                String body = response.getBody();
+                JSONObject ob = JSON.parseObject(body);
+                body = ob.getString("resultData");
+
+                String text=  ob.getString("text");
+                fileId = ob.getString("fileId");
+
+            }catch (Exception e){
+
+            }
+
+
+        }
+
+        return ResultModel.OK();
+    }
+
     @ApiOperation(value = "根据图片ID,访问图片")
     @GetMapping("/image/{id}")
     public void getImg(@PathVariable("id") String id, HttpServletResponse response){
@@ -101,6 +172,9 @@ public class FileController {
         return ResultModel.OK(baseDataImage.getId());
     }
 
+
+
+
     private String getFilePath(String sourceFileName) {
         Date nowDate = new Date();
         // 生成新的文件名

zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/controller/SubjectController.java

@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.UnsupportedEncodingException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -95,7 +96,13 @@ public class SubjectController {
             QueryWrapper<Subject> queryWrapper = new QueryWrapper<Subject>();
             queryWrapper.select("suject_dy").eq("id", id);
             Subject subject = subjectMapper.selectOne(queryWrapper);
-            subjectdy=subject.getSujectDy();
+
+            try {
+                subjectdy=new String(subject.getSujectDy(),"utf-8");
+            } catch (Exception e) {
+                subjectdy="";
+            }
+
         }
 //        JSONObject data = JSONObject.parseObject(subjectdy);//获取jsonobject对象
 //        subjectdy = data.getString("result");
@@ -116,7 +123,13 @@ public class SubjectController {
             QueryWrapper<Subject> queryWrapper = new QueryWrapper<Subject>();
             queryWrapper.select("point_analysis").eq("id", id);
             Subject subject = subjectMapper.selectOne(queryWrapper);
-            pointAnalysis=subject.getPointAnalysis();
+//            pointAnalysis=subject.getPointAnalysis();
+            try {
+                pointAnalysis=new String(subject.getPointAnalysis(),"utf-8");
+                logger.info("观点分析:"+pointAnalysis);
+            } catch (Exception e) {
+                pointAnalysis="";
+            }
         }
 //        JSONObject data = JSONObject.parseObject(pointAnalysis);//获取jsonobject对象
 //        pointAnalysis = data.getString("result");
@@ -139,7 +152,12 @@ public class SubjectController {
             QueryWrapper<Subject> queryWrapper = new QueryWrapper<Subject>();
             queryWrapper.select("event_context").eq("id", id);
             Subject subject = subjectMapper.selectOne(queryWrapper);
-            eventContext=subject.getEventContext();
+//            eventContext=subject.getEventContext();
+            try {
+                eventContext=new String(subject.getEventContext(),"utf-8");
+            } catch (Exception e) {
+                eventContext="";
+            }
         }
 //        JSONObject data = JSONObject.parseObject(eventContext);//获取jsonobject对象
 //        eventContext = data.getString("result");
@@ -160,7 +178,12 @@ public class SubjectController {
             QueryWrapper<Subject> queryWrapper = new QueryWrapper<Subject>();
             queryWrapper.select("propagation_path").eq("id", id);
             Subject subject = subjectMapper.selectOne(queryWrapper);
-            propagationPath=subject.getPropagationPath();
+//            propagationPath=subject.getPropagationPath();
+            try {
+                propagationPath=new String(subject.getPropagationPath(),"utf-8");
+            } catch (Exception e) {
+                propagationPath="";
+            }
         }
 //        JSONObject data = JSONObject.parseObject(propagationPath);//获取jsonobject对象
 //        propagationPath = data.getString("result");
@@ -181,7 +204,12 @@ public class SubjectController {
             QueryWrapper<Subject> queryWrapper = new QueryWrapper<Subject>();
             queryWrapper.select("statistic_analysis").eq("id", id);
             Subject subject = subjectMapper.selectOne(queryWrapper);
-            statisticAnalysis=subject.getStatisticAnalysis();
+//            statisticAnalysis=subject.getStatisticAnalysis();
+            try {
+            statisticAnalysis=new String(subject.getStatisticAnalysis(),"utf-8");
+            } catch (Exception e) {
+            statisticAnalysis="";
+            }
         }
 //        JSONObject data = JSONObject.parseObject(statisticAnalysis);//获取jsonobject对象
 //        statisticAnalysis = data.getString("result");
@@ -202,7 +230,11 @@ public class SubjectController {
             QueryWrapper<Subject> queryWrapper = new QueryWrapper<Subject>();
             queryWrapper.select("hot_words").eq("id", id);
             Subject subject = subjectMapper.selectOne(queryWrapper);
-            hotwords=subject.getHotWords();
+            try {
+                hotwords=new String(subject.getHotWords(),"utf-8");
+            } catch (Exception e) {
+                hotwords="";
+            }
         }
 //        JSONObject data = JSONObject.parseObject(statisticAnalysis);//获取jsonobject对象
 //        statisticAnalysis = data.getString("result");

zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/entity/CisAnsBasedata.java

@@ -100,7 +100,7 @@ public class CisAnsBasedata implements Serializable {
 
     public String getContentString(){
         if(content==null || content.length==0){
-            return "";
+            return contentString;
         }
         try {
             return new String(content,"UTF-8");

zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/entity/LinkEntity.java

+package com.zzsn.modules.kgj.entity;
+
+import lombok.Data;
+
+@Data
+public class LinkEntity {
+    Integer id;
+    Integer source;
+    Integer target;
+    String name;
+
+}

zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/entity/NodeEntity.java

+package com.zzsn.modules.kgj.entity;
+
+import lombok.Data;
+
+@Data
+public class NodeEntity {
+    Integer id;
+    Integer category;
+    String name;
+
+}

zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/entity/Subject.java

@@ -21,35 +21,36 @@ public class Subject implements Serializable {
     专题名称
      */
     String title;
-    /*
+ /*
     专题动态
      */
-    @TableField(value="suject_dy")
-    String sujectDy;
+
+    @TableField(value="suject_dy",exist = false,typeHandler = com.zzsn.common.util.BlobTypeHandler.class)
+    private byte[]  sujectDy;
     /*
    观点分析
     */
-    @TableField(value="point_analysis")
-    String pointAnalysis;
+    @TableField(value="point_analysis",exist = false,typeHandler = com.zzsn.common.util.BlobTypeHandler.class)
+    private byte[]  pointAnalysis;
     /*
    事件脉络
     */
-    @TableField(value="event_context")
-    String eventContext;
+    @TableField(value="event_context",exist = false,typeHandler = com.zzsn.common.util.BlobTypeHandler.class)
+    private byte[] eventContext;
     /*
    传播路径
     */
-    @TableField(value="propagation_path")
-    String propagationPath;
+    @TableField(value="propagation_path",exist = false,typeHandler = com.zzsn.common.util.BlobTypeHandler.class)
+    private byte[] propagationPath;
     /*
    统计分析
     */
-    @TableField(value="statistic_analysis")
-    String statisticAnalysis;
+    @TableField(value="statistic_analysis",exist = false,typeHandler = com.zzsn.common.util.BlobTypeHandler.class)
+    private byte[] statisticAnalysis;
 
     /*
     热词动态
     */
-    @TableField(value="hot_words")
-    String hotWords;
+    @TableField(value="hot_words",exist = false,typeHandler = com.zzsn.common.util.BlobTypeHandler.class)
+    private byte[] hotWords;
 }

zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/mapper/xml/BaseDataMapper.xml

@@ -771,6 +771,7 @@
 								<![CDATA[		and a.SECRET_LEVEL >6 ]]>
 							</if>
 						</trim>) d on b.id=d.BID
+					WHERE d.SECRET_LEVEL > 0
 					order by b.PUBLISH_DATE desc) TMP_PAGE
 		WHERE ROWNUM <![CDATA[<=]]> #{offsetEnd}) a
 		WHERE ROW_ID <![CDATA[>]]> #{offsetFrom}

zzsn-cloud-system/zzsn-cloud-system-biz/src/main/java/com/zzsn/modules/kgj/mapper/xml/CisAnsBasedataMapper.xml

@@ -425,6 +425,7 @@
         b.reliability,
         b.orientation,
         t.delflag
+
         FROM cis_ans_basedata b
         left JOIN cis_ans_basedata_type t ON t.bid = b.id
         left JOIN CIS_BASEDATA_WEB_MID m on b.ID=m.BID
@@ -586,15 +587,18 @@
         <if test=" list!=null and list.size>0">
             left JOIN CIS_COL_SITE_TYPE_MID s on s.SITEID =m.WEB_ID
         </if>
-        WHERE b.isdelete = 0
-        AND b.locale=1
+        WHERE b.isdelete = 1
+        AND b.locale not in ('2','3','4')
         AND  t.tid = 16865 AND b.id>20092000000000 AND t.org_id=3942
         <if test="title!=null and  title!=''">
             AND b.title like  #{title}
         </if>
         <if test='delflag != null'>
-            <if test='delflag =="2" or delflag =="3" '>
-                and t.delflag in ('2','3')
+            <if test='delflag =="2" '>
+                and t.delflag  in ('2','3')
+            </if>
+            <if test='delflag =="3" '>
+                and t.delflag ='3'
             </if>
             <if test='delflag =="1"'>
                 and t.delflag not in ('0','2','3')
@@ -633,8 +637,8 @@
         <if test=" list!=null and list.size>0">
             left JOIN CIS_COL_SITE_TYPE_MID s on s.SITEID =m.WEB_ID
         </if>
-        WHERE b.isdelete = 0
-        AND b.locale=1
+        WHERE b.isdelete = 1
+        AND b.locale  not in ('2','3','4')
         AND t.tid = 16865 AND b.id>20092000000000 AND t.org_id=3942
 
       <if test="publishDate_begin!=null and  publishDate_begin!=''">
@@ -644,9 +648,12 @@
           AND #{publishDate_end} > t.publish_date
       </if>
       <if test='delflag != null'>
-          <if test='delflag =="2" or delflag =="3" '>
+          <if test='delflag =="2" '>
               and t.delflag  in ('2','3')
           </if>
+          <if test='delflag =="3" '>
+              and t.delflag ='3'
+          </if>
           <if test='delflag =="1"'>
               and t.delflag not in ('0','2','3')
           </if>

zzsn-cloud-system/zzsn-cloud-system-biz/src/main/resources/bootstrap.yml

@@ -46,9 +46,9 @@ jeecg :
   uploadType: local
   path :
     #文件上传根目录 设置
-    upload: D://opt//upFiles
+    upload: /opt//upFiles
     #webapp文件路径
-    webapp: D://opt//webapp
+    webapp: /opt//webapp
   #短信秘钥
   sms:
      accessKeyId: ??
@@ -350,3 +350,4 @@ tupu:
    secretkrul: http://127.0.0.1:8018/Text/similarity/
    graphkrul: http://127.0.0.1:8018/Text/graph/
 
+paserUrl: http://127.0.0.1:8018/Text/graph/