fix: 更新环境

src/main/java/com/zhiqiyun/open/camera/config/CameraConfig.java

@@ -1,5 +1,6 @@
 package com.zhiqiyun.open.camera.config;
 
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.XmlUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiqiyun.open.exception.ServiceException;
@@ -34,13 +35,41 @@ public class CameraConfig {
     public final static String USER_NAME = "duijie01";
     public final static String USER_NAME_URBAN = "duijie";
     public final static String PASSWORD = "Huawei@12#$";
-//    public final static String VCM_URI = "http://59.211.51.102:18531";
+    //    public final static String VCM_URI = "http://59.211.51.102:18531";
     public final static String VCM_URI = "https://10.35.5.111:8090/ly";
     public final static int SUCCESS_STATUS_CODE = 200;
     public final static int SUCCESS_CODE = 0;
 
     public final static String RESULT_CODE = "resultCode";
 
+    //一张图城管
+    public final static String RTSP_207 = "rtsp://10.37.113.207:1159";
+    public final static String RTSP_NEW_207 = "rtsp://10.35.5.111:8090/r207";
+    //旅游
+    public final static String RTSP_208 = "rtsp://10.37.113.208:1159";
+    public final static String RTSP_NEW_208 = "rtsp://10.35.5.111:8090/r208";
+
+    public static String replaceUri(String uri) {
+        if (uri.contains(CameraConfig.RTSP_207)) {
+            return uri.replace(CameraConfig.RTSP_207, CameraConfig.RTSP_NEW_207);
+        }
+        if (uri.contains(CameraConfig.RTSP_208)) {
+            return uri.replace(CameraConfig.RTSP_208, CameraConfig.RTSP_NEW_208);
+        }
+        return uri;
+    }
+
+    public static void main(String[] args) {
+        //2 游客访问量
+        //        System.out.println(RandomUtil.randomInt(20000, 150000));
+        //3 购物消费
+//        System.out.println(RandomUtil.randomInt(20000, 150000));
+        //4 娱乐消费
+//        System.out.println(RandomUtil.randomInt(10000, 100000));
+        //5 工作人员执勤分布
+        System.out.println(RandomUtil.randomInt(30, 100));
+    }
+
     /**
      * 创建默认的ssl链接
      *
@@ -117,10 +146,10 @@ public class CameraConfig {
         HttpEntity entity = response.getEntity();
         //用EntityUtils.toString()这个静态方法将HttpEntity转换成字符串,防止服务器返回的数据带有中文,所以在转换的时候将字符集指定成utf-8就可以了
         String result = EntityUtils.toString(entity, "UTF-8");
-        log.info("-------------------------" + result + "-------------");
-        log.info("CloseableHttpResponse msg：{}", JSONObject.toJSONString(response));
+//        log.info("-------------------------" + result + "-------------");
+//        log.info("CloseableHttpResponse msg：{}", JSONObject.toJSONString(response));
         if (response.getStatusLine().getStatusCode() == SUCCESS_STATUS_CODE) {
-            log.info("-----------success------------------{}", result);
+            log.info("-----------success------------------");
             JSONObject jsonObject = JSONObject.parseObject(result);
             int code = jsonObject.getIntValue(RESULT_CODE);
             if (code == SUCCESS_CODE) {

src/main/java/com/zhiqiyun/open/camera/rtsp/RtspPushSrs.java

@@ -27,7 +27,7 @@ public class RtspPushSrs {
 //    public final static String SRS_PUSH_ADDRESS = "http://116.8.106.156:9800/live/livestream/%s.flv";
 
     //内网推流地址
-    public final static String INTRANET_SRS_PUSH_ADDRESS = "rtmp://172.31.119.10:1935/live/livestream/%s";
+    public final static String INTRANET_SRS_PUSH_ADDRESS = "rtmp://172.31.119.9:1935/live/livestream/%s";
 
     //外网拉流地址
 //    public final static String SRS_PUSH_ADDRESS = "http://222.84.255.194:9800/live/livestream/%s.flv";

src/main/java/com/zhiqiyun/open/core/mapper/statistics/HyMonitorConsumeMapper.java

@@ -14,20 +14,20 @@ import java.util.Map;
 @Mapper
 public interface HyMonitorConsumeMapper extends BaseMapper<HyMonitorConsume> {
 
-    @Select("select IFNULL(SUM(hmc.money),0) as money,IFNULL(count(hmc.id),0) as total from hy_monitor_consume hmc where hmc.is_deleted = 0 and DATE_FORMAT(hmc.create_date,'%Y%m') = #{time}")
+    @Select("select IFNULL(SUM(hmc.money),0) as money,IFNULL(count(hmc.id),0) as total from liucheng_smart.hy_monitor_consume hmc where hmc.is_deleted = 0 and DATE_FORMAT(hmc.create_date,'%Y%m') = #{time}")
     Map<String, Object> countMonthConsume(String time);
 
-    @Select("select * from (select DATE_FORMAT(hmc.create_date,'%Y-%m-%d') as `label`,SUM(hmc.money) AS `value` from hy_monitor_consume hmc where hmc.is_deleted = 0 group by DATE_FORMAT(hmc.create_date,'%Y-%m-%d')) h where h.label >= #{start} and h.label <= #{end}")
-    List<EchartsModel> consumeMonitorByDay(@Param("start") String start, @Param("end") String end);
+    @Select("select * from (select DATE_FORMAT(hmc.create_date,'%Y-%m-%d') as `label`,SUM(hmc.money) AS `value` from liucheng_smart.hy_monitor_consume hmc where hmc.is_deleted = 0 group by DATE_FORMAT(hmc.create_date,'%Y-%m-%d')) h where h.label >= #{start}")
+    List<EchartsModel> consumeMonitorByDay(@Param("start") String start);
 
-    @Select("select * from (select DATE_FORMAT(hmc.create_date,'%Y-%m') as `label`,SUM(hmc.money) AS `value` from hy_monitor_consume hmc where hmc.is_deleted = 0 group by DATE_FORMAT(hmc.create_date,'%Y-%m')) h where h.label >= #{start} and h.label <= #{end}")
-    List<EchartsModel> consumeMonitorByMonths(@Param("start") String start, @Param("end") String end);
+    @Select("select * from (select DATE_FORMAT(hmc.create_date,'%Y-%m') as `label`,SUM(hmc.money) AS `value` from liucheng_smart.hy_monitor_consume hmc where hmc.is_deleted = 0 group by DATE_FORMAT(hmc.create_date,'%Y-%m')) h where h.label >= #{start}")
+    List<EchartsModel> consumeMonitorByMonths(@Param("start") String start);
 
-    @Select("select * from (select DATE_FORMAT(hmc.create_date,'%Y-%m-%d') as `label`,SUM(hmc.quantity) AS `value` from liucheng_smart.xc_monitor_desc hmc where hmc.is_deleted = 0 and hmc.monitor_type = 2 group by DATE_FORMAT(hmc.create_date,'%Y-%m-%d')) h where h.label >= #{start} and h.label <= #{end}")
-    List<EchartsModel> sentimentMonitorByDay(@Param("start") String start, @Param("end") String end);
+    @Select("select * from (select DATE_FORMAT(hmc.create_date,'%Y-%m-%d') as `label`,SUM(hmc.quantity) AS `value` from liucheng_smart.xc_monitor_desc hmc where hmc.is_deleted = 0 and hmc.monitor_type = 2 group by DATE_FORMAT(hmc.create_date,'%Y-%m-%d')) h where h.label >= #{start}")
+    List<EchartsModel> sentimentMonitorByDay(@Param("start") String start);
 
-    @Select("select * from (select DATE_FORMAT(hmc.create_date,'%Y-%m-%d') as `label`,SUM(hmc.quantity) AS `value` from liucheng_smart.xc_monitor_desc hmc where hmc.is_deleted = 0 and hmc.monitor_type = 3 group by DATE_FORMAT(hmc.create_date,'%Y-%m-%d')) h where h.label >= #{start} and h.label <= #{end}")
-    List<EchartsModel> dispatchMonitorByDay(@Param("start") String start, @Param("end") String end);
+    @Select("select * from (select DATE_FORMAT(hmc.create_date,'%Y-%m-%d') as `label`,SUM(hmc.quantity) AS `value` from liucheng_smart.xc_monitor_desc hmc where hmc.is_deleted = 0 and hmc.monitor_type = 3 group by DATE_FORMAT(hmc.create_date,'%Y-%m-%d')) h where h.label >= #{start}")
+    List<EchartsModel> dispatchMonitorByDay(@Param("start") String start);
 
     @Select("select SUM(person) from liucheng_smart.xc_monitor where is_deleted = 0 and in_or_out = 1")
     int visitsTotal();
@@ -44,10 +44,10 @@ public interface HyMonitorConsumeMapper extends BaseMapper<HyMonitorConsume> {
     @Select("SELECT xc.source_area AS label,SUM(xc.person) AS `value` FROM liucheng_smart.xc_monitor xc WHERE is_deleted = 0  and in_or_out = 1 GROUP BY label ORDER BY `value` DESC LIMIT 10")
     List<EchartsModel> sourceCityRank();
 
-    @Select("select hmc.gender as label,count(hmc.id) as `value` from hy_monitor_consume hmc where hmc.is_deleted = 0 and hmc.mechanism_id = #{orgId} group by hmc.gender")
+    @Select("select hmc.gender as label,count(hmc.id) as `value` from liucheng_smart.hy_monitor_consume hmc where hmc.is_deleted = 0 and hmc.mechanism_id = #{orgId} group by hmc.gender")
     List<EchartsModel> spotGender(Long orgId);
 
-    @Select("select SUBSTRING_INDEX(hmc.source_area,'、',1) as label,count(hmc.id) as `value` from hy_monitor_consume hmc where hmc.is_deleted = 0 and hmc.mechanism_id = #{orgId} group by label ORDER BY `value` DESC LIMIT 10")
+    @Select("select SUBSTRING_INDEX(hmc.source_area,'、',1) as label,count(hmc.id) as `value` from liucheng_smart.hy_monitor_consume hmc where hmc.is_deleted = 0 and hmc.mechanism_id = #{orgId} group by label ORDER BY `value` DESC LIMIT 10")
     List<EchartsModel> sourceGender(Long orgId);
 
     /**

src/main/java/com/zhiqiyun/open/core/service/impl/HyMonitorConsumeServiceImpl.java

@@ -40,28 +40,32 @@ public class HyMonitorConsumeServiceImpl extends ServiceImpl<HyMonitorConsumeMap
     @Override
     public List<EchartsModel> consumeMonitorByDay() {
         List<String> dayList = DateUtil.getDayList(7);
-        List<EchartsModel> models = baseMapper.consumeMonitorByDay(dayList.get(0), dayList.get(6));
+        List<EchartsModel> models = baseMapper.consumeMonitorByDay(dayList.get(0));
+        log.info("consumeMonitorByDay：{}", JSONUtil.toJsonStr(models));
         return CommonUtils.getEchartsModel(dayList, models);
     }
 
     @Override
     public List<EchartsModel> consumeMonitorByMonths() {
         List<String> dayList = DateUtil.getMonths(7);
-        List<EchartsModel> models = baseMapper.consumeMonitorByMonths(dayList.get(0), dayList.get(6));
+        List<EchartsModel> models = baseMapper.consumeMonitorByMonths(dayList.get(0));
+        log.info("consumeMonitorByMonths：{}", JSONUtil.toJsonStr(models));
         return CommonUtils.getEchartsModel(dayList, models);
     }
 
     @Override
     public List<EchartsModel> sentimentMonitorByDay() {
         List<String> dayList = DateUtil.getDayList(7);
-        List<EchartsModel> models = baseMapper.sentimentMonitorByDay(dayList.get(0), dayList.get(6));
+        List<EchartsModel> models = baseMapper.sentimentMonitorByDay(dayList.get(0));
+        log.info("sentimentMonitorByDay：{}", JSONUtil.toJsonStr(models));
         return CommonUtils.getEchartsModel(dayList, models);
     }
 
     @Override
     public List<EchartsModel> dispatchMonitorByDay() {
         List<String> dayList = DateUtil.getDayList(7);
-        List<EchartsModel> models = baseMapper.dispatchMonitorByDay(dayList.get(0), dayList.get(6));
+        List<EchartsModel> models = baseMapper.dispatchMonitorByDay(dayList.get(0));
+        log.info("dispatchMonitorByDay：{}", JSONUtil.toJsonStr(models));
         return CommonUtils.getEchartsModel(dayList, models);
     }
 

src/main/java/com/zhiqiyun/open/core/service/impl/UploadFileInfoServiceImpl.java

@@ -66,7 +66,7 @@ public class UploadFileInfoServiceImpl extends ServiceImpl<UploadFileInfoMapper,
             Matcher m = r.matcher(originalFilename);
             if (m.find()){
                 extension = m.group(0).substring(1);
-            }else if(originalFilename.equals("mp4")) {
+            }else if("mp4".equals(originalFilename)) {
                 extension= originalFilename;
             }else{
                 MagicMatch magicMatch = Magic.getMagicMatch(fileBuff);

src/main/java/com/zhiqiyun/open/core/video/impl/VideoDockingServiceImpl.java

@@ -106,9 +106,8 @@ public class VideoDockingServiceImpl implements VideoDockingService {
     public JSONObject loadDeviceList(Map<String, String> paramValues) throws Exception {
         paramValues.put("deviceType", "33");
         CloseableHttpResponse response = httpGet("/device/deviceList/v1.0", paramValues, getValidToken());
-        JSONObject body = getApacheBody(response);
-        log.info("获取到的设备列表：{}", body.toJSONString());
-        return body;
+        //        log.info("获取到的设备列表：{}", body.toJSONString());
+        return getApacheBody(response);
     }
 
     @Override
@@ -261,7 +260,7 @@ public class VideoDockingServiceImpl implements VideoDockingService {
                 .setConnectTimeout(10000)
                 //数据读取超时时间5秒
                 .setSocketTimeout(5000)
-                .setProxy(new HttpHost(proxyHost, proxyPort))
+//                .setProxy(new HttpHost(proxyHost, proxyPort))
                 .setCookieSpec(CookieSpecs.STANDARD).build();
         HttpGet httpGet = new HttpGet(url);
         httpGet.setHeader("Content-Type", "application/json;charset=UTF-8");
@@ -303,7 +302,7 @@ public class VideoDockingServiceImpl implements VideoDockingService {
                 .setConnectTimeout(10000)
                 //数据读取超时时间5秒
                 .setSocketTimeout(5000)
-                .setProxy(new HttpHost(proxyHost, proxyPort))
+//                .setProxy(new HttpHost(proxyHost, proxyPort))
                 .setCookieSpec(CookieSpecs.STANDARD).build();
 
         // 2. 创建POST请求

src/main/java/com/zhiqiyun/open/core/video/impl/VideoDockingUrbanServiceImpl.java

@@ -256,7 +256,7 @@ public class VideoDockingUrbanServiceImpl implements VideoDockingUrbanService {
                 .setConnectTimeout(10000)
                 //数据读取超时时间5秒
                 .setSocketTimeout(5000)
-                .setProxy(new HttpHost(proxyHost, proxyPort))
+//                .setProxy(new HttpHost(proxyHost, proxyPort))
                 .setCookieSpec(CookieSpecs.STANDARD).build();
         HttpGet httpGet = new HttpGet(url);
         httpGet.setHeader("Content-Type", "application/json;charset=UTF-8");

src/main/java/com/zhiqiyun/open/router/apis/HwVideoApi.java

@@ -1,12 +1,15 @@
 package com.zhiqiyun.open.router.apis;
 
 import cn.hutool.crypto.SecureUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dliyun.oap.framework.annotation.ServiceMethod;
 import com.dliyun.oap.framework.annotation.ServiceMethodBean;
 import com.dliyun.oap.framework.response.OapResponse;
 import com.google.common.collect.Maps;
+import com.zhiqiyun.open.camera.config.CameraConfig;
 import com.zhiqiyun.open.camera.rtsp.RtspPushSrs;
 import com.zhiqiyun.open.camera.rtsp.RtspTransfer;
 import com.zhiqiyun.open.core.models.hwVideo.DeviceList;
@@ -22,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import javax.validation.Valid;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
 
@@ -49,7 +54,7 @@ public class HwVideoApi {
             params.put("toIndex", String.valueOf(request.getPage() * request.getLimit()));
             JSONObject jsonObject = request.getLoadType().compareTo(1) == 0 ? videoDockingService.loadDeviceList(params)
                     : videoDockingUrbanService.loadDeviceList(params);
-            log.info("设备信息：{}", jsonObject.toJSONString());
+//            log.info("设备信息：{}", jsonObject.toJSONString());
             JSONObject cameraBriefExInfos = jsonObject.getJSONObject("cameraBriefExInfos");
             int total = cameraBriefExInfos.getIntValue("total");
             JSONObject cameraBriefInfoExList = cameraBriefExInfos.getJSONObject("cameraBriefInfoExList");
@@ -63,42 +68,97 @@ public class HwVideoApi {
         return OapResponse.success();
     }
 
+    private final static String SRS_API = "https://10.35.5.111:8090";
+
     @ServiceMethod(method = "hw.video.url.find", title = "获取视频URL信息")
     public OapResponse loadVideoRtspUrl(@Valid VideoRtsUrlRequest request) throws Exception {
-        VideoRtsUrlResponse response = new VideoRtsUrlResponse();
+
         JSONObject jsonObject = request.getLoadType().compareTo(1) == 0 ? videoDockingService.loadVideoRtspUrl(request.getCameraCode())
                 : videoDockingUrbanService.loadVideoRtspUrl(request.getCameraCode());
         String rtspUri = jsonObject.getString("rtspURL");
         log.info("获取到监控rtspURI：{}", rtspUri);
-        if (StringUtils.isBlank(rtspUri)) return OapResponse.fail("ERROR", "视频流地址获取失败");
+        rtspUri = CameraConfig.replaceUri(rtspUri);
+        log.info("获取到监控rtspURI：{}", rtspUri);
+        if (StringUtils.isBlank(rtspUri)) {
+            return OapResponse.fail("ERROR", "视频流地址获取失败");
+        }
         String rtspId = request.getCameraCode().split("#")[0];
-        RtspTransfer.createRtspId(rtspUri, rtspId);
-        response.setRtspId(rtspId);
-        log.info("RtspTransfer.STREAM_MAP：{}", RtspTransfer.STREAM_MAP.get(rtspId));
-        if (StringUtils.isNotBlank(RtspTransfer.STREAM_MAP.get(rtspId))) {
-            response.setRtspUri(RtspTransfer.STREAM_MAP.get(rtspId));
-        } else {
-            rtspUri = String.format(RtspPushSrs.SRS_PUSH_ADDRESS, SecureUtil.md5(rtspId));
-            log.info("重新进行流推送：{}", rtspUri);
-            taskExecutor.execute(() -> {
-                try {
-                    //停顿1秒在进行推流，已缓解频繁开启或关闭推流造成的问题
-                    Thread.sleep(1000);
-                    RtspTransfer.startPushRtmp(rtspId);
-                } catch (Exception e) {
-                    log.info("============停止推流=======================");
-                    RtspTransfer.removeRtsp(rtspId);
-                }
-            });
-            RtspTransfer.STREAM_MAP.put(rtspId, rtspUri);
-            response.setRtspUri(rtspUri);
+        String body = HttpRequest.get(SRS_API + "/api/v1/srs/push")
+                .form("rtspId", rtspId)
+                .form("rtspUri", URLEncoder.encode(rtspUri, "utf-8"))
+                .execute().body();
+        log.info("推流返回信息：{}", body);
+        JSONObject obJson = JSONObject.parseObject(body);
+        if (0 != obJson.getIntValue("code")) {
+            return OapResponse.fail("ERROR", "视频流地址获取失败");
         }
+        VideoRtsUrlResponse response = obJson.getJSONObject("data").toJavaObject(VideoRtsUrlResponse.class);
+//        RtspTransfer.createRtspId(rtspUri, rtspId);
+//        response.setRtspId(rtspId);
+//        log.info("RtspTransfer.STREAM_MAP：{}", RtspTransfer.STREAM_MAP.get(rtspId));
+//        if (StringUtils.isNotBlank(RtspTransfer.STREAM_MAP.get(rtspId))) {
+//            response.setRtspUri(RtspTransfer.STREAM_MAP.get(rtspId));
+//        } else {
+//            rtspUri = String.format(RtspPushSrs.SRS_PUSH_ADDRESS, SecureUtil.md5(rtspId));
+//            log.info("重新进行流推送：{}", rtspUri);
+//            taskExecutor.execute(() -> {
+//                try {
+//                    //停顿1秒在进行推流，已缓解频繁开启或关闭推流造成的问题
+//                    Thread.sleep(1000);
+//                    RtspTransfer.startPushRtmp(rtspId);
+//                } catch (Exception e) {
+//                    log.info("============停止推流=======================");
+//                    RtspTransfer.removeRtsp(rtspId);
+//                }
+//            });
+//            RtspTransfer.STREAM_MAP.put(rtspId, rtspUri);
+//            response.setRtspUri(rtspUri);
+//        }
         return OapResponse.success().setBody(response);
     }
+//    @ServiceMethod(method = "hw.video.url.find", title = "获取视频URL信息")
+//    public OapResponse loadVideoRtspUrl(@Valid VideoRtsUrlRequest request) throws Exception {
+//        VideoRtsUrlResponse response = new VideoRtsUrlResponse();
+//        JSONObject jsonObject = request.getLoadType().compareTo(1) == 0 ? videoDockingService.loadVideoRtspUrl(request.getCameraCode())
+//                : videoDockingUrbanService.loadVideoRtspUrl(request.getCameraCode());
+//        String rtspUri = jsonObject.getString("rtspURL");
+//        log.info("获取到监控rtspURI：{}", rtspUri);
+//        rtspUri = CameraConfig.replaceUri(rtspUri);
+//        log.info("获取到监控rtspURI：{}", rtspUri);
+//        if (StringUtils.isBlank(rtspUri)) return OapResponse.fail("ERROR", "视频流地址获取失败");
+//        String rtspId = request.getCameraCode().split("#")[0];
+//        RtspTransfer.createRtspId(rtspUri, rtspId);
+//        response.setRtspId(rtspId);
+//        log.info("RtspTransfer.STREAM_MAP：{}", RtspTransfer.STREAM_MAP.get(rtspId));
+//        if (StringUtils.isNotBlank(RtspTransfer.STREAM_MAP.get(rtspId))) {
+//            response.setRtspUri(RtspTransfer.STREAM_MAP.get(rtspId));
+//        } else {
+//            rtspUri = String.format(RtspPushSrs.SRS_PUSH_ADDRESS, SecureUtil.md5(rtspId));
+//            log.info("重新进行流推送：{}", rtspUri);
+//            taskExecutor.execute(() -> {
+//                try {
+//                    //停顿1秒在进行推流，已缓解频繁开启或关闭推流造成的问题
+//                    Thread.sleep(1000);
+//                    RtspTransfer.startPushRtmp(rtspId);
+//                } catch (Exception e) {
+//                    log.info("============停止推流=======================");
+//                    RtspTransfer.removeRtsp(rtspId);
+//                }
+//            });
+//            RtspTransfer.STREAM_MAP.put(rtspId, rtspUri);
+//            response.setRtspUri(rtspUri);
+//        }
+//        return OapResponse.success().setBody(response);
+//    }
 
     @ServiceMethod(method = "hw.video.live.stop", title = "停止视频推流工作")
     public OapResponse videoStopPush(VideoStopPushRequest request) throws Exception {
-        RtspTransfer.removeRtsp(request.getRtspId());
+        log.info("============停止推流=======================：{}", JSONUtil.toJsonStr(request));
+        String body = HttpRequest.get(SRS_API + "/api/v1/srs/stop")
+                .form("rtspId", request.getRtspId())
+                .execute().body();
+        log.info("============停止推流=======================：{}", body);
+//        RtspTransfer.removeRtsp(request.getRtspId());
         return OapResponse.success();
     }
 }

src/main/java/com/zhiqiyun/open/router/request/hwVideo/VideoRtsUrlResponse.java

@@ -5,8 +5,6 @@ import com.dliyun.oap.framework.request.AbstractOapRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @author NINGMEI
  */