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/searchClient/BaseSearchNoveltyRepeatDO.java

@@ -33,6 +33,15 @@ public class BaseSearchNoveltyRepeatDO extends UuidIdentityEntityWithOperator {
   /* private String update_time;           //更新时间
    private String update_user_name;      //更新用户*/
    private String statusName;            //状态名称
    private String showType;                  //显示与隐藏   1.显示    0.隐藏
    public String getShowType() {
        return showType;
    }
    public void setShowType(String showType) {
        this.showType = showType;
    }
    public String getStatusName() {
        return statusName;

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

@@ -869,6 +869,7 @@ public class BaseRequestMapping {
        public static final String REPLY = "/reply";
        public static final String FILEDOWNLOAD = "/fileDownLoad";
        public static final String FILEUPLOAD = "/fileUpLoad";
        public static final String SHOWTYPE = "/showType";
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/searchClient/ClientSearchEndpoint.java

@@ -133,5 +133,18 @@ public class ClientSearchEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping(BaseRequestMapping.ClientSearch.SHOWTYPE)
    @ApiOperation("隐藏与显示")
    public Envelop ShowType(@ApiParam(name = "id",value = "")
                            @RequestParam(value = "id",required = true) String id,
                            @ApiParam(name = "showType",value = "")
                            @RequestParam(value = "showType",required = true) String showType){
        try{
            clientSearchService.updataShowType(id,showType);
            return success("success");
        }catch (Exception e){
            return failedException(e);
        }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/clientSearch/ClientSearchService.java

@@ -27,13 +27,6 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
    public BaseSearchNoveltyRepeatDO saveBaseSearchNoveltyRepeat(BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO){
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd HH:mm:ss");
        Date date = new Date();
        /*String str = sdf.format(date);
        str.replace("-","");
        str.replace("-","");
        str.replace(":","");
        str.replace(":","");
        str.replace(" ","");
        String num = str;*/
        Random r = new Random();
        //获取随机数
        int number = r.nextInt();
@@ -41,6 +34,7 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
        baseSearchNoveltyRepeatDO.setStatus(1);
        baseSearchNoveltyRepeatDO.setStatusName("待接收");
        baseSearchNoveltyRepeatDO.setCreateTime(new Date());
        baseSearchNoveltyRepeatDO.setShowType("1");       //默认值是1，显示
        return baseSearchNoveltyRepeatDao.save(baseSearchNoveltyRepeatDO);
    }
@@ -106,4 +100,11 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
        return baseSearchNoveltyRepeatDO;
    }
    public void updataShowType(String id,String showType) {
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.findOne(id);
        if (baseSearchNoveltyRepeatDO != null){
            baseSearchNoveltyRepeatDO.setShowType(showType);
            baseSearchNoveltyRepeatDao.save(baseSearchNoveltyRepeatDO);
        }
    }
}