|  | @ -86,7 +86,7 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
 | 
	
		
			
				|  |  |         BaseSensitiveDO baseSensitiveDO = baseSensitiveDao.findOne(id);
 | 
	
		
			
				|  |  |         baseSensitiveDO.setSensitiveWord(words);
 | 
	
		
			
				|  |  |         baseSensitiveDO.setExplanation(explanation);
 | 
	
		
			
				|  |  |         baseSensitiveDO.setRenewTime(DateUtil.getNowDate());
 | 
	
		
			
				|  |  |         baseSensitiveDO.setUpdateTime(DateUtil.getNowDate());
 | 
	
		
			
				|  |  |         baseSensitiveDO.setOperatorCode(operatorCode);
 | 
	
		
			
				|  |  |         baseSensitiveDO.setOperator(name);
 | 
	
		
			
				|  |  |         baseSensitiveDO.setStatus(status);
 | 
	
	
		
			
				|  | @ -112,7 +112,7 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
 | 
	
		
			
				|  |  |     public void updateSensitiveWordsStatus(String id, String status,String operatorCode,String name) {
 | 
	
		
			
				|  |  |         BaseSensitiveDO baseSensitiveDO = baseSensitiveDao.findOne(id);
 | 
	
		
			
				|  |  |         baseSensitiveDO.setStatus(status);
 | 
	
		
			
				|  |  |         baseSensitiveDO.setRenewTime(DateUtil.getNowDate());
 | 
	
		
			
				|  |  |         baseSensitiveDO.setUpdateTime(DateUtil.getNowDate());
 | 
	
		
			
				|  |  |         baseSensitiveDO.setOperatorCode(operatorCode);
 | 
	
		
			
				|  |  |         baseSensitiveDO.setOperator(name);
 | 
	
		
			
				|  |  |         baseSensitiveDao.save(baseSensitiveDO);
 | 
	
	
		
			
				|  | @ -134,10 +134,10 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
 | 
	
		
			
				|  |  |             countSql.append(" AND s.status='").append(status).append("'");
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (StringUtils.isNotEmpty(words)){
 | 
	
		
			
				|  |  |             sql.append(" AND (s.sensitive like'%").append(words).append("%'").append(" or ").append("s.explanation like'%").append(words).append("%')");
 | 
	
		
			
				|  |  |             countSql.append(" AND (s.sensitive like'%").append(words).append("%'").append(" or ").append("s.explanation like'%").append(words).append("%')");
 | 
	
		
			
				|  |  |             sql.append(" AND (s.sensitive_word like'%").append(words).append("%'").append(" or ").append("s.explanation like'%").append(words).append("%')");
 | 
	
		
			
				|  |  |             countSql.append(" AND (s.sensitive_word like'%").append(words).append("%'").append(" or ").append("s.explanation like'%").append(words).append("%')");
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         sql.append(" ORDER BY s.renew_time desc LIMIT ").append((page-1)*pageSize).append(",").append(pageSize);
 | 
	
		
			
				|  |  |         sql.append(" ORDER BY s.update_time desc LIMIT ").append((page-1)*pageSize).append(",").append(pageSize);
 | 
	
		
			
				|  |  |         Logger.getAnonymousLogger().info("sql="+sql.toString());
 | 
	
		
			
				|  |  |         List<BaseSensitiveDO> list = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(BaseSensitiveDO.class));
 | 
	
		
			
				|  |  |         List<Map<String, Object>> mapList = jdbcTemplate.queryForList(countSql.toString());
 | 
	
	
		
			
				|  | @ -148,12 +148,11 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 导出敏感词日志
 | 
	
		
			
				|  |  |      * @param url
 | 
	
		
			
				|  |  |      * @param operatorCode
 | 
	
		
			
				|  |  |      * @return
 | 
	
		
			
				|  |  |      */
 | 
	
		
			
				|  |  |     public MixEnvelop exportSensitiveWordsLog(String url,String operatorCode){
 | 
	
		
			
				|  |  |         String sql="SELECT * FROM base_import_sensitive b WHERE b.create_time=(SELECT MAX(b.create_time) FROM base_import_sensitive b) and b.operator_code="+operatorCode;
 | 
	
		
			
				|  |  |     public MixEnvelop exportSensitiveWordsLog(HttpServletResponse response,String operatorCode){
 | 
	
		
			
				|  |  |         String sql="SELECT * FROM base_import_sensitive b WHERE b.create_time=(SELECT MAX(b.create_time) FROM base_import_sensitive b) and b.operator_code='"+operatorCode+"'";
 | 
	
		
			
				|  |  |         //获取日志
 | 
	
		
			
				|  |  |         List<BaseImportSensitiveDO> list =jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BaseImportSensitiveDO.class));
 | 
	
		
			
				|  |  |         //拼接字符串
 | 
	
	
		
			
				|  | @ -166,31 +165,30 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
 | 
	
		
			
				|  |  |             text.append(one.getProblem());
 | 
	
		
			
				|  |  |             text.append("\r\n");//换行字符
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         InputStream is = new ByteArrayInputStream(text.toString().getBytes());
 | 
	
		
			
				|  |  |         String name = genAttachmentFileName("导入日志.txt", "import.txt");
 | 
	
		
			
				|  |  |         UploadVO uploadVO=new UploadVO();
 | 
	
		
			
				|  |  |         byte[] bytes = text.toString().getBytes();
 | 
	
		
			
				|  |  |         OutputStream os = null;
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  |             Logger.getAnonymousLogger().info("文件上传参数=name"+name+"---url="+url);
 | 
	
		
			
				|  |  |             uploadVO = fileUploadService.uploadStream(is, name, url);
 | 
	
		
			
				|  |  |         } catch (Exception e) {
 | 
	
		
			
				|  |  |             os = response.getOutputStream();
 | 
	
		
			
				|  |  |             response.addHeader("Content-Type", "text/html");
 | 
	
		
			
				|  |  |             os.write(bytes);
 | 
	
		
			
				|  |  |             os.flush();
 | 
	
		
			
				|  |  |         }catch (Exception e){
 | 
	
		
			
				|  |  |             e.printStackTrace();
 | 
	
		
			
				|  |  |             Logger.getAnonymousLogger().info("文件上传失败");
 | 
	
		
			
				|  |  |             Logger.getAnonymousLogger().info(e.getMessage());
 | 
	
		
			
				|  |  |             return MixEnvelop.getError("日志导出失败");
 | 
	
		
			
				|  |  |         }finally {
 | 
	
		
			
				|  |  |             if (os != null) {
 | 
	
		
			
				|  |  |                 try {
 | 
	
		
			
				|  |  |                     os.close();
 | 
	
		
			
				|  |  |                 } catch (IOException e) {
 | 
	
		
			
				|  |  |                     e.printStackTrace();
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         return MixEnvelop.getSuccess("下载日志成功",uploadVO);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public  String genAttachmentFileName(String cnName, String defaultName) {
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  |             cnName = new String(cnName.getBytes("gb2312"), "ISO8859-1");
 | 
	
		
			
				|  |  |         } catch (Exception e) {
 | 
	
		
			
				|  |  |             cnName = defaultName;
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         return cnName;
 | 
	
		
			
				|  |  |         return MixEnvelop.getSuccess("下载日志成功",os);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 导入敏感词
 | 
	
		
			
				|  |  |      * @param correctLs
 |