Browse Source

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

wangjun 4 năm trước cách đây
mục cha
commit
b1b613fd9a

+ 1 - 0
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@ -3455,6 +3455,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        rs.put("patientName",wlyyOutpatientDO.getPatientName());
        rs.put("doctor",wlyyOutpatientDO.getDoctor());
        rs.put("doctorName",wlyyOutpatientDO.getDoctorName());
        rs.put("patientCode",wlyyOutpatientDO.getPatient());
        return rs;
    }

+ 3 - 4
business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@ -2841,17 +2841,16 @@ public class ImService {
	 * 发送医生取消IM消息
	 * @param patientName
	 * @param doctor
	 * @param doctorName
	 * @param session_id
	 * @param cancleReason
	 * @param cancleContent
	 * @return
	 */
	public String sendOutPatientCancle(String patientName, String doctor, String doctorName, String session_id, String cancleReason, String cancleContent) {
	public String sendOutPatientCancle(String patientName,String patientCode,String doctor,String cancleReason, String cancleContent) {
		JSONObject msg = new JSONObject();
		msg.put("content",patientName+",您好!您的复诊已被医生取消");
		msg.put("cancleReason",cancleReason);
		msg.put("cancleContent",cancleContent);
		return imUtil.sendImMsg(doctor, doctorName, session_id, "36",msg.toString(),"1");
		logger.info("开始发送"+msg.toJSONString());
		return imUtil.sendMessage(doctor,patientCode,"2",msg.toString());
	}
}

+ 1 - 0
common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@ -421,6 +421,7 @@ public class BaseRequestMapping {
        public static final String findSensitiveWords = "/findSensitiveWords";
        public static final String importSensitiveWords = "/importSensitiveWords";
        public static final String exportSensitiveWordsLog = "/exportSensitiveWordsLog";
        public static final String filterSensitiveWords = "/filterSensitiveWords";
    }

+ 26 - 22
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/word/BaseSensitiveEndpoint.java

@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
import java.util.Map;
@ -132,40 +133,32 @@ public class BaseSensitiveEndpoint extends EnvelopRestEndpoint {
        }
    }
//    @GetMapping(value = BaseRequestMapping.BaseSensitive.importSensitiveWords)
//    @ApiOperation(value = "导入敏感词")
//    public MixEnvelop importSensitiveWords (
//            @ApiParam(name = "file", value = "文件", required = true)
//            @RequestPart(value = "file") MultipartFile file,
//            HttpServletRequest request) throws IOException, ManageException {
//        try {
//            request.setCharacterEncoding("UTF-8");
//            return baseSensitiveService.importSensitiveWords(file,getUID(),getUNAME());
//        } catch (Exception e) {
//            return MixEnvelop.getError(e.getMessage());
//        }
//    @GetMapping(value = BaseRequestMapping.BaseSensitive.exportSensitiveWordsLog)
//    @ApiOperation(value = "导出日志")
//    public void exportSensitiveWordsLog (HttpServletResponse response) throws Exception {
//        response.setContentType("octets/stream");
//        response.setHeader("Content-Disposition", "attachment; filename="+ new String( "sensitiveLog.xls"));
//        OutputStream os = response.getOutputStream();
//            baseSensitiveService.exportSensitiveWordsLog(os);
//    }
    @GetMapping(value = BaseRequestMapping.BaseSensitive.exportSensitiveWordsLog)
    @ApiOperation(value = "导出日志")
    public MixEnvelop exportSensitiveWordsLog (HttpServletResponse response) throws Exception {
            return baseSensitiveService.exportSensitiveWordsLog(response,getUID());
    }
    @GetMapping(value = BaseRequestMapping.BaseSensitive.importSensitiveWords)
    @PostMapping(value = BaseRequestMapping.BaseSensitive.importSensitiveWords)
    @ApiOperation(value = "导入敏感词")
    public Envelop importData(
            @ApiParam(name = "file", value = "文件", required = true)
            @RequestPart(value = "file") MultipartFile file,
            HttpServletRequest request) throws IOException, ManageException {
            HttpServletRequest request,HttpServletResponse response){
        try {
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename="+ new String( "sensitiveLog.xls"));
            OutputStream os = response.getOutputStream();
            request.setCharacterEncoding("UTF-8");
            baseSensitiveExcelReader.read(file);
            //验证未通过(暂无验证)
            List<BaseSensitiveExcelDO> correctLs = baseSensitiveExcelReader.getCorrectLs();
            if(correctLs.size()>0){
                Map<String, Object> result = baseSensitiveService.importSensitive(correctLs,getUID(),getUNAME());
                result.put("correctLs", correctLs);
                Map<String, Object> result = baseSensitiveService.importSensitive(correctLs,getUID(),getUNAME(),os,fastdfs_file_url);
                return success("导入成功!", result);
            }
        }catch (Exception e){
@ -174,4 +167,15 @@ public class BaseSensitiveEndpoint extends EnvelopRestEndpoint {
        }
        return failed("导入失败");
    }
    @GetMapping(value = BaseRequestMapping.BaseSensitive.filterSensitiveWords)
    @ApiOperation(value = "导出日志")
    public MixEnvelop filterSensitiveWords (
            @ApiParam(name = "txt", value = "txt")
            @RequestParam(value = "txt", required = false) String txt
    ) throws Exception {
        return baseSensitiveService.filterSensitiveWords(txt);
    }
}

+ 1 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/service/word/BaseSensitiveExcelReader.java

@ -37,6 +37,7 @@ public class BaseSensitiveExcelReader extends AExcelReader {
                if ((rows = sheetAt.getLastRowNum()) == 0) {
                   return;
                }
            correctLs.clear();
                for (int i = 1; i <= rows; i++) {
                    baseSensitiveExcelDO = new BaseSensitiveExcelDO();
                    baseSensitiveExcelDO.setId(getCellCont(sheetAt, i, 0));

+ 107 - 33
svr/svr-base/src/main/java/com/yihu/jw/base/service/word/BaseSensitiveService.java

@ -6,6 +6,8 @@ import com.yihu.jw.base.dao.word.BaseSensitiveDao;
import com.yihu.jw.base.service.doctor.excelImport.BaseDoctorExcelDO;
import com.yihu.jw.base.service.word.excelImport.BaseSensitiveExcelDO;
import com.yihu.jw.base.useragent.UserAgent;
import com.yihu.jw.base.util.SensitiveWordInit;
import com.yihu.jw.base.util.SensitivewordFilter;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.sync.BaseSyncDataDO;
@ -18,6 +20,8 @@ import com.yihu.jw.rm.health.house.HealthyHouseMapping;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import jxl.Workbook;
import jxl.write.*;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@ -98,9 +102,11 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
     * @param ids
     */
    public void delSensitiveWords(String ids) {
        List<String> list = JSONObject.parseObject(ids, List.class);
        String[] list = ids.split(",");
        for (String id : list) {
            baseSensitiveDao.delete(id);
            if (StringUtils.isNotEmpty(id)){
                baseSensitiveDao.delete(id);
            }
        }
    }
@ -110,14 +116,16 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
     * @param status
     */
    public void updateSensitiveWordsStatus(String ids, String status,String operatorCode,String name) {
        List<String> list = JSONObject.parseObject(ids, List.class);
        String[] list = ids.split(",");
        for (String id : list) {
            BaseSensitiveDO baseSensitiveDO = baseSensitiveDao.findOne(id);
            baseSensitiveDO.setStatus(status);
            baseSensitiveDO.setUpdateTime(DateUtil.getNowDate());
            baseSensitiveDO.setOperatorCode(operatorCode);
            baseSensitiveDO.setOperator(name);
            baseSensitiveDao.save(baseSensitiveDO);
            if (StringUtils.isNotEmpty(id)){
                BaseSensitiveDO baseSensitiveDO = baseSensitiveDao.findOne(id);
                baseSensitiveDO.setStatus(status);
                baseSensitiveDO.setUpdateTime(DateUtil.getNowDate());
                baseSensitiveDO.setOperatorCode(operatorCode);
                baseSensitiveDO.setOperator(name);
                baseSensitiveDao.save(baseSensitiveDO);
            }
        }
    }
@ -133,7 +141,7 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
    public MixEnvelop findSensitiveWords(String status, String words, Integer page, Integer pageSize) {
        StringBuffer sql = new StringBuffer("select * from base_sensitive s where 1=1 ");
        StringBuffer countSql = new StringBuffer("select count(*) count from base_sensitive s where 1=1 ");
        if (StringUtils.isNotEmpty(status)){
        if (!status.equalsIgnoreCase("null")){
            sql.append(" AND s.status='").append(status).append("'");
            countSql.append(" AND s.status='").append(status).append("'");
        }
@ -152,15 +160,48 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
    /**
     * 导出敏感词日志
     * @param operatorCode
     * @param
     * @return
     */
    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+"'";
        //获取日志
    public String exportSensitiveWordsLog(OutputStream os,String operatorCode,String path) throws Exception {
        String sql="SELECT * FROM base_import_sensitive b WHERE b.create_time=(SELECT MAX(b.create_time) FROM base_import_sensitive b WHERE b.operator_code='"+operatorCode+"') ";
        List<BaseImportSensitiveDO> list =jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BaseImportSensitiveDO.class));
//        WritableWorkbook wwb = jxl.Workbook.createWorkbook(os);
//
//        try {
//            WritableSheet ws;
//            ws = wwb.createSheet("sheet", 1);
//
//            String[] header = {"序号", "原因"};
//            int k = 0;
//            for (String h : header) {
//                addCell(ws, 0, k, h);//表名,行,列,header
//                k++;
//            }
//            int i = 1;
//
//            for (BaseImportSensitiveDO one : list) {
//                addCell(ws, i, 0,one.getRow() , "");
//                addCell(ws, i, 1,  one.getProblem(), "");
//                i++;
//            }
//            wwb.write();
//            wwb.close();
//        } catch (IOException e) {
//            e.printStackTrace();
//            if (wwb != null){
//                wwb.close();
//            }
//            throw e;
//        }
//        byte[] bytes = wwb.toString().getBytes();
//        InputStream in = new ByteArrayInputStream(bytes) {
//        };
//        UploadVO uploadVO = fileUploadService.uploadStream(in, "sentitiveLog.xls", path);
        //拼接字符串
        StringBuffer text = new StringBuffer();
            text.append("序号").append("   ").append("原因");
        for(BaseImportSensitiveDO one:list){
            text.append("第");
            text.append(one.getRow());
@ -170,35 +211,36 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
            text.append("\r\n");//换行字符
        }
        byte[] bytes = text.toString().getBytes();
        OutputStream os = null;
        try {
            os = response.getOutputStream();
            response.addHeader("Content-Type", "multipart/form-data");
            os.write(bytes);
            os.flush();
        }catch (Exception e){
            e.printStackTrace();
        }finally {
            if (os != null) {
                try {
                    os.close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
        InputStream in = new ByteArrayInputStream(bytes);
        UploadVO uploadVO = fileUploadService.uploadStream(in, "sentitiveLog.xls", path);
        return uploadVO.getFullUri();
    }
        return MixEnvelop.getSuccess("下载日志成功",os);
    //添加单元格内容
    public void addCell(WritableSheet ws, int row, int column, String data) throws WriteException {
        Label label = new Label(column, row, data);
        ws.addCell(label);
    }
    //添加单元格内容
    public void addCell(WritableSheet ws, int row, int column, String data, String memo) throws WriteException {
        Label label = new Label(column, row, data);
        if (!org.springframework.util.StringUtils.isEmpty(memo)) {
            WritableCellFeatures cellFeatures = new WritableCellFeatures();
            cellFeatures.setComment(memo);
            label.setCellFeatures(cellFeatures);
        }
        ws.addCell(label);
    }
    /**
     * 导入敏感词
     * @param correctLs
     * @return
     */
    public Map<String, Object> importSensitive(List<BaseSensitiveExcelDO> correctLs,String operatorCode,String name) {
    public Map<String, Object> importSensitive(List<BaseSensitiveExcelDO> correctLs,String operatorCode,String name,OutputStream os,String fastdfs_file_url){
        Map<String, Object> rs = new HashMap<>();
        int total = correctLs.size();
        rs.put("total",total);
@ -237,9 +279,41 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
            baseSensitiveDO.setAddTime(nowDate);
            baseSensitiveDao.save(baseSensitiveDO);
        }
        //
        try {
            String url = exportSensitiveWordsLog(os, operatorCode, fastdfs_file_url);
            rs.put("downloadLogUrl",url);
            Logger.getGlobal().info("downloadLogUrl="+url);
        } catch (Exception e) {
            e.printStackTrace();
            rs.put("downloadLogUrl","导出日志失败");
            Logger.getGlobal().info("Logerror="+e.getMessage());
        }
        rs.put("success",total);
        return rs;
    }
    /**
     * 敏感词过滤
     * @param txt
     * @return
     */
    public MixEnvelop filterSensitiveWords(String txt){
        List<BaseSensitiveDO> list = (List<BaseSensitiveDO>) baseSensitiveDao.findAll();
        HashSet<String> set = new HashSet<>();
        for (BaseSensitiveDO one : list) {
            set.add(one.getSensitiveWord());
        }
        SensitivewordFilter filter = new SensitivewordFilter(set);
        Set<String> words = filter.getSensitiveWord(txt, 1);
        Logger.getGlobal().info("语句中包含敏感词的个数为:" + words.size() + "。包含:" + words);
        Logger.getAnonymousLogger().info("过滤前="+txt);
        String replaceTxt = filter.replaceSensitiveWord(txt, 1, "*");
        Logger.getGlobal().info("过滤后="+replaceTxt);
        return MixEnvelop.getSuccess("过滤成功",replaceTxt);
    }
}

+ 143 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/util/SensitiveWordInit.java

@ -0,0 +1,143 @@
package com.yihu.jw.base.util;
import java.io.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
public class SensitiveWordInit {
	private String ENCODING = "GBK";    //字符编码
	public HashMap sensitiveWordMap;
	public SensitiveWordInit(){
		super();
	}
	/**
	 * @author chenming
	 * @date 2014年4月20日 下午2:28:32
	 * @version 1.0
	 */
	public Map initKeyWord(String txt){
		try {
			//读取敏感词库
			Set<String> keyWordSet = readSensitiveWordFile(txt);
			//将敏感词库加入到HashMap中
			addSensitiveWordToHashMap(keyWordSet);
			//spring获取application,然后application.setAttribute("sensitiveWordMap",sensitiveWordMap);
		} catch (Exception e) {
			e.printStackTrace();
		}
		return sensitiveWordMap;
	}
	public Map initKeyWord(Set<String> keyWordSet ){
		try {
			//将敏感词库加入到HashMap中
			addSensitiveWordToHashMap(keyWordSet);
			//spring获取application,然后application.setAttribute("sensitiveWordMap",sensitiveWordMap);
		} catch (Exception e) {
			e.printStackTrace();
		}
		return sensitiveWordMap;
	}
	/**
	 * 读取敏感词库,将敏感词放入HashSet中,构建一个DFA算法模型:<br>
	 * 中 = {
	 *      isEnd = 0
	 *      国 = {<br>
	 *      	 isEnd = 1
	 *           人 = {isEnd = 0
	 *                民 = {isEnd = 1}
	 *                }
	 *           男  = {
	 *           	   isEnd = 0
	 *           		人 = {
	 *           			 isEnd = 1
	 *           			}
	 *           	}
	 *           }
	 *      }
	 *  五 = {
	 *      isEnd = 0
	 *      星 = {
	 *      	isEnd = 0
	 *      	红 = {
	 *              isEnd = 0
	 *              旗 = {
	 *                   isEnd = 1
	 *                  }
	 *              }
	 *      	}
	 *      }
	 * @author chenming
	 * @date 2014年4月20日 下午3:04:20
	 * @param keyWordSet  敏感词库
	 * @version 1.0
	 */
	private void addSensitiveWordToHashMap(Set<String> keyWordSet) {
		sensitiveWordMap = new HashMap(keyWordSet.size());     //初始化敏感词容器,减少扩容操作
		String key = null;
		Map nowMap = null;
		Map<String, String> newWorMap = null;
		//迭代keyWordSet
		Iterator<String> iterator = keyWordSet.iterator();
		while(iterator.hasNext()){
			key = iterator.next();    //关键字
			nowMap = sensitiveWordMap;
			for(int i = 0 ; i < key.length() ; i++){
				char keyChar = key.charAt(i);       //转换成char型
				Object wordMap = nowMap.get(keyChar);       //获取
				if(wordMap != null){        //如果存在该key,直接赋值
					nowMap = (Map) wordMap;
				}
				else{     //不存在则,则构建一个map,同时将isEnd设置为0,因为他不是最后一个
					newWorMap = new HashMap<String,String>();
					newWorMap.put("isEnd", "0");     //不是最后一个
					nowMap.put(keyChar, newWorMap);
					nowMap = newWorMap;
				}
				if(i == key.length() - 1){
					nowMap.put("isEnd", "1");    //最后一个
				}
			}
		}
	}
	/**
	 * 读取敏感词库中的内容,将内容添加到set集合中
	 * @author chenming
	 * @date 2014年4月20日 下午2:31:18
	 * @return
	 * @version 1.0
	 * @throws Exception
	 */
	private Set<String> readSensitiveWordFile(String words) throws Exception{
		Set<String> set = null;
		byte[] bytes = words.getBytes();
		InputStream is = new ByteArrayInputStream(bytes);
		InputStreamReader read = new InputStreamReader(is);
		try {
				set = new HashSet<String>();
				BufferedReader bufferedReader = new BufferedReader(read);
				String txt = null;
				while((txt = bufferedReader.readLine()) != null){    //读取文件,将文件内容放入到set中
				set.add(txt);
			}
		} catch (Exception e) {
			throw e;
		}finally{
			read.close();     //关闭文件流
		}
		return set;
	}
}

+ 165 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/util/SensitivewordFilter.java

@ -0,0 +1,165 @@
package com.yihu.jw.base.util;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2020/7/8
 */
public class SensitivewordFilter {
    private Map sensitiveWordMap = null;
    public static int minMatchTYpe = 1;      //最小匹配规则
    public static int maxMatchType = 2;      //最大匹配规则
    /**
     * 构造函数,初始化敏感词库
     */
    public SensitivewordFilter(String txt){
        sensitiveWordMap = new SensitiveWordInit().initKeyWord(txt);
    }
    public SensitivewordFilter(HashSet<String> set){
        sensitiveWordMap = new SensitiveWordInit().initKeyWord(set);
    }
    /**
     * 判断文字是否包含敏感字符
     * @author chenming
     * @date 2014年4月20日 下午4:28:30
     * @param txt  文字
     * @param matchType  匹配规则&nbsp;1:最小匹配规则,2:最大匹配规则
     * @return 若包含返回true,否则返回false
     * @version 1.0
     */
    public boolean isContaintSensitiveWord(String txt,int matchType){
        boolean flag = false;
        for(int i = 0 ; i < txt.length() ; i++){
            int matchFlag = this.CheckSensitiveWord(txt, i, matchType); //判断是否包含敏感字符
            if(matchFlag > 0){    //大于0存在,返回true
                flag = true;
            }
        }
        return flag;
    }
    /**
     * 获取文字中的敏感词
     * @author chenming
     * @date 2014年4月20日 下午5:10:52
     * @param txt 文字
     * @param matchType 匹配规则&nbsp;1:最小匹配规则,2:最大匹配规则
     * @return
     * @version 1.0
     */
    public Set<String> getSensitiveWord(String txt , int matchType){
        Set<String> sensitiveWordList = new HashSet<String>();
        for(int i = 0 ; i < txt.length() ; i++){
            int length = CheckSensitiveWord(txt, i, matchType);    //判断是否包含敏感字符
            if(length > 0){    //存在,加入list中
                sensitiveWordList.add(txt.substring(i, i+length));
                i = i + length - 1;    //减1的原因,是因为for会自增
            }
        }
        return sensitiveWordList;
    }
    /**
     * 替换敏感字字符
     * @author chenming
     * @date 2014年4月20日 下午5:12:07
     * @param txt
     * @param matchType
     * @param replaceChar 替换字符,默认*
     * @version 1.0
     */
    public String replaceSensitiveWord(String txt,int matchType,String replaceChar){
        String resultTxt = txt;
        Set<String> set = getSensitiveWord(txt, matchType);     //获取所有的敏感词
        Iterator<String> iterator = set.iterator();
        String word = null;
        String replaceString = null;
        while (iterator.hasNext()) {
            word = iterator.next();
            replaceString = getReplaceChars(replaceChar, word.length());
            resultTxt = resultTxt.replaceAll(word, replaceString);
        }
        return resultTxt;
    }
    /**
     * 获取替换字符串
     * @author chenming
     * @date 2014年4月20日 下午5:21:19
     * @param replaceChar
     * @param length
     * @return
     * @version 1.0
     */
    private String getReplaceChars(String replaceChar,int length){
        String resultReplace = replaceChar;
        for(int i = 1 ; i < length ; i++){
            resultReplace += replaceChar;
        }
        return resultReplace;
    }
    /**
     * 检查文字中是否包含敏感字符,检查规则如下:<br>
     * @author chenming
     * @date 2014年4月20日 下午4:31:03
     * @param txt
     * @param beginIndex
     * @param matchType
     * @return,如果存在,则返回敏感词字符的长度,不存在返回0
     * @version 1.0
     */
    public int CheckSensitiveWord(String txt,int beginIndex,int matchType){
        boolean  flag = false;    //敏感词结束标识位:用于敏感词只有1位的情况
        int matchFlag = 0;     //匹配标识数默认为0
        char word = 0;
        Map nowMap = sensitiveWordMap;
        for(int i = beginIndex; i < txt.length() ; i++){
            word = txt.charAt(i);
            nowMap = (Map) nowMap.get(word);     //获取指定key
            if(nowMap != null){     //存在,则判断是否为最后一个
                matchFlag++;     //找到相应key,匹配标识+1
                if("1".equals(nowMap.get("isEnd"))){       //如果为最后一个匹配规则,结束循环,返回匹配标识数
                    flag = true;       //结束标志位为true
                    if(SensitivewordFilter.minMatchTYpe == matchType){    //最小规则,直接返回,最大规则还需继续查找
                        break;
                    }
                }
            }
            else{     //不存在,直接返回
                break;
            }
        }
        if(matchFlag < 1 || !flag){        //长度必须大于等于1,为词
            matchFlag = 0;
        }
        return matchFlag;
    }
    public static void main(String[] args) {
        SensitivewordFilter filter = new SensitivewordFilter("情节");
        System.out.println("敏感词的数量:" + filter.sensitiveWordMap.size());
        String string = "太多的伤感情怀也许只局限于饲养基地 荧幕中的情节,主人公尝试着去用某种方式渐渐的很潇洒地释自杀指南怀那些自己经历的伤感。"
                + "然后法轮功 我们的扮演的角色就是跟随着主人公的喜红客联盟 怒哀乐而过于牵强的把自己的情感也附加于银幕情节中,然后感动就流泪,"
                + "难过就躺在某一个人的怀里尽情的阐述心扉或者手机卡复制器一个人一杯红酒一部电影在夜三级片 深人静的晚上,关上电话静静的发呆着。";
        System.out.println("待检测语句字数:" + string.length());
        long beginTime = System.currentTimeMillis();
        Set<String> set = filter.getSensitiveWord(string, 1);
        long endTime = System.currentTimeMillis();
        System.out.println("语句中包含敏感词的个数为:" + set.size() + "。包含:" + set);
        System.out.println("总共消耗时间为:" + (endTime - beginTime));
        String s = filter.replaceSensitiveWord("太多的伤感情怀也许只局限于饲养基地 荧幕中的情节,主人公尝试着去用某种方式渐渐的很潇洒地释自杀指南怀那些自己经历的伤感", 1, "*");
        System.out.println(s);
    }
}

+ 5 - 4
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@ -470,11 +470,12 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
		try {
			map = prescriptionService.cancelOutPatient(outPatientId,cancelType,cancelValue,cancelRemark,2,wxId);
			if (map != null) {
				logger.info("进入外层");
				if (map.get("code").toString().equalsIgnoreCase("1")){
					String patientName = map.get("patientName").toString();
					String patientCode = map.get("patientCode").toString();
					String doctor = map.get("doctor").toString();
					String doctorName = map.get("doctorName").toString();
					String immsg = imService.sendOutPatientCancle(patientName,doctor,doctorName,"system",cancelRemark,cancelValue);
					String immsg = imService.sendOutPatientCancle(patientName,patientCode,doctor,cancelRemark,cancelValue);
					System.out.println("发送拒绝接诊消息成功:"+immsg);
				}
			}
@ -786,7 +787,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
		return success("操作成功",prescriptionService.getConsultSuggest(consultcode));
	}
	
	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.sendOutPatientCancle)
/*	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.sendOutPatientCancle)
	@ApiOperation(value = "医生端:发送医生取消IM消息", notes = "医生端:发送医生取消IM消息")
	public Envelop sendOutPatientCancle(@ApiParam(name = "patientName", value = "patientName")
	                                     @RequestParam(value = "patientName", required = true)String patientName,
@ -810,6 +811,6 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
//            e.printStackTrace();
		}
		return success("操作成功");
	}
	}*/
}