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

common/common-entity/src/main/java/com/yihu/jw/entity/base/score/BaseEvaluateScoreDO.java

@@ -25,7 +25,7 @@ public class BaseEvaluateScoreDO extends UuidIdentityEntityWithOperator {
    private String relationCode;//所属业务关系code，例如：1为咨询code',
    private Double score;//主表分数',
    private Integer type;//1、实名，2、匿名',
    private String pennantList;//锦旗类型
    @Column(name = "city")
    public String getCity() {
@@ -134,13 +134,4 @@ public class BaseEvaluateScoreDO extends UuidIdentityEntityWithOperator {
    public void setType(Integer type) {
        this.type = type;
    }
    @Column(name = "pennant_list")
    public String getPennantList() {
        return pennantList;
    }
    public void setPennantList(String pennantList) {
        this.pennantList = pennantList;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/words/BaseSensitiveDO.java

@@ -34,8 +34,6 @@ public class BaseSensitiveDO extends UuidIdentityEntityWithOperator {
    @Column(name = "add_time")
    private Date addTime;
    @Column(name = "renew_time")
    private Date renewTime;
    public String getSensitiveWord() {
        return sensitiveWord;
@@ -76,14 +74,7 @@ public class BaseSensitiveDO extends UuidIdentityEntityWithOperator {
    public void setAddTime(Date addTime) {
        this.addTime = addTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getRenewTime() {
        return renewTime;
    }
    public void setRenewTime(Date renewTime) {
        this.renewTime = renewTime;
    }
    public String getOperatorCode() {
        return operatorCode;

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -51,9 +52,9 @@ public class BaseSensitiveEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "explanation", value = "说明")
            @RequestParam(value = "explanation", required = false) String explanation,
            @ApiParam(name = "status", value = "status")
            @RequestParam(value = "status", required = false,defaultValue = "1") String status) throws Exception {
            @RequestParam(value = "status", required = false,defaultValue = "1") Integer status) throws Exception {
        try {
            baseSensitiveService.createSensitiveWords(words,explanation,status,getUID(),getUNAME());
            baseSensitiveService.createSensitiveWords(words,explanation,status+"",getUID(),getUNAME());
            return MixEnvelop.getSuccess("创建成功");
        } catch (Exception e) {
            return MixEnvelop.getError(e.getMessage());
@@ -100,12 +101,12 @@ public class BaseSensitiveEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.BaseSensitive.updateSensitiveWordsStatus)
    @ApiOperation(value = "修改敏感词汇状态")
    public MixEnvelop updateSensitiveWordsStatus (
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = false) String id,
            @ApiParam(name = "ids", value = "ids")
            @RequestParam(value = "ids", required = false) String ids,
            @ApiParam(name = "status", value = "status")
            @RequestParam(value = "status", required = false) String status) throws Exception {
            @RequestParam(value = "status", required = false,defaultValue = "1") Integer status) throws Exception {
        try {
            baseSensitiveService.updateSensitiveWordsStatus(id,status,getUID(),getUNAME());
            baseSensitiveService.updateSensitiveWordsStatus(ids,status+"",getUID(),getUNAME());
            return MixEnvelop.getSuccess("修改成功");
        } catch (Exception e) {
            return MixEnvelop.getError(e.getMessage());
@@ -120,11 +121,11 @@ public class BaseSensitiveEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "pageSize", value = "pageSize")
            @RequestParam(value = "pageSize", required = false,defaultValue = "15") Integer pageSize,
            @ApiParam(name = "status", value = "status")
            @RequestParam(value = "status", required = false) String status,
            @RequestParam(value = "status", required = false) Integer status,
            @ApiParam(name = "words", value = "words")
            @RequestParam(value = "words", required = false) String words) throws Exception {
        try {
            return baseSensitiveService.findSensitiveWords(status,words,page,pageSize);
            return baseSensitiveService.findSensitiveWords(status+"",words,page,pageSize);
        } catch (Exception e) {
            return MixEnvelop.getError(e.getMessage());
@@ -147,8 +148,8 @@ public class BaseSensitiveEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.BaseSensitive.exportSensitiveWordsLog)
    @ApiOperation(value = "导出日志")
    public MixEnvelop exportSensitiveWordsLog () throws Exception {
            return baseSensitiveService.exportSensitiveWordsLog(fastdfs_file_url,getUID());
    public MixEnvelop exportSensitiveWordsLog (HttpServletResponse response) throws Exception {
            return baseSensitiveService.exportSensitiveWordsLog(response,getUID());
    }
    @GetMapping(value = BaseRequestMapping.BaseSensitive.importSensitiveWords)

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

@@ -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);
@@ -106,16 +106,20 @@ public class BaseSensitiveService extends BaseJpaService<BaseSensitiveDO, BaseSe
    /**
     * 修改敏感词状态
     * @param id
     * @param ids
     * @param status
     */
    public void updateSensitiveWordsStatus(String id, String status,String operatorCode,String name) {
        BaseSensitiveDO baseSensitiveDO = baseSensitiveDao.findOne(id);
        baseSensitiveDO.setStatus(status);
        baseSensitiveDO.setRenewTime(DateUtil.getNowDate());
        baseSensitiveDO.setOperatorCode(operatorCode);
        baseSensitiveDO.setOperator(name);
        baseSensitiveDao.save(baseSensitiveDO);
    public void updateSensitiveWordsStatus(String ids, String status,String operatorCode,String name) {
        List<String> list = JSONObject.parseObject(ids, List.class);
        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);
        }
    }
    /**
@@ -134,10 +138,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 +152,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 +169,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", "multipart/form-data");
            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