Merge branch 'test'

src/main/java/com/fdkankan/ucenter/service/impl/SceneCooperationServiceImpl.java

@@ -637,8 +637,10 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
                 for (SceneCooperation entity : list) {
                     User user = userMap.get(entity.getUserId());
                     cooMap.computeIfAbsent(entity.getSceneNum(), k -> new ArrayList<>());
-                    if(!cooMap.get(entity.getSceneNum()).contains(user)){
-                        cooMap.get(entity.getSceneNum()).add(user);
+                    if(user != null){
+                        if(!cooMap.get(entity.getSceneNum()).contains(user)){
+                            cooMap.get(entity.getSceneNum()).add(user);
+                        }
                     }
                 }
             }

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -23,6 +23,7 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.SceneEnum;
 import com.fdkankan.ucenter.common.SceneSourceUtil;
+import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.common.constants.ResultCodeMsg;
 import com.fdkankan.ucenter.config.UcenterConfig;
 import com.fdkankan.ucenter.config.ThreadPoolConfig;
@@ -167,11 +168,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         SceneEnum[] values = SceneEnum.values();
         for (SceneEnum sceneEnum : values) {
-//            if(sceneEnum.getObj() == 0){
-//                SceneNumVo sceneNumVo1 = fdkkLaserService.getLaserSceneNumByUser(token, sceneEnum.getSceneSource().get(0));
-//                hashMap.put(sceneEnum.getName(),sceneNumVo1);
-//            }
-            if(sceneEnum.getName().equals("kk")){
+            if(!"aws".equals(NacosProperty.uploadType) && sceneEnum.getIsObj() == 0){
+                SceneNumVo sceneNumVo1 = fdkkLaserService.getLaserSceneNumByUser(token, sceneEnum.getSceneSource().get(0));
+                hashMap.put(sceneEnum.getName(),sceneNumVo1);
+            }else if(sceneEnum.getName().equals("kk")){
                 SceneNumVo sceneNumVo = new SceneNumVo();
                 sceneNumVo.setSceneNum(Long.valueOf(count));
                 hashMap.put(sceneEnum.getName(),sceneNumVo);
@@ -186,6 +186,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(sceneEnum == null ){
                 continue;
             }
+            if(!"aws".equals(NacosProperty.uploadType) && sceneEnum.getIsObj() == 0){
+                continue;
+            }
             SceneNumVo sceneNumVo = hashMap.get(sceneEnum.getName());
             sceneNumVo.setSceneNum( sceneNumVo.getSceneNum() + vo.getSceneNum() );
             sceneNumVo.setCooperationSceneNum( sceneNumVo.getCooperationSceneNum() + vo.getCooperationSceneNum() );
@@ -193,17 +196,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             sceneNumVo.setIsObj(sceneEnum.getIsObj());
             hashMap.put(sceneEnum.getName(),sceneNumVo);
         }
-
-        for (String key : hashMap.keySet()) {
-            SceneNumVo sceneNumVo = hashMap.get(key);
-            if(sceneNumVo.getIsObj() != null && sceneNumVo.getIsObj()==0){
-                SceneNumVo sceneNumVo1 = hashMap.get(key + "_OBJ");
-                if(sceneNumVo1 != null){
-                    sceneNumVo.setSceneNum(sceneNumVo.getSceneNum() + sceneNumVo1.getSceneNum());
-                    sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
+        if("aws".equals(NacosProperty.uploadType) ){
+            for (String key : hashMap.keySet()) {
+                SceneNumVo sceneNumVo = hashMap.get(key);
+                if(sceneNumVo.getIsObj() != null && sceneNumVo.getIsObj()==0){
+                    SceneNumVo sceneNumVo1 = hashMap.get(key + "_OBJ");
+                    if(sceneNumVo1 != null){
+                        sceneNumVo.setSceneNum(sceneNumVo.getSceneNum() + sceneNumVo1.getSceneNum());
+                        sceneNumVo.setTotalNum(sceneNumVo.getSceneNum() + sceneNumVo.getCooperationSceneNum());
+                    }
                 }
             }
         }
+
         return hashMap;
     }
 
@@ -624,7 +629,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             for (SceneVo vo : sceneVoPage.getRecords()) {
                 if (StringUtils.isNotBlank(vo.getNum())) {
                     List<User> userVos = cooMap.get(vo.getNum());
-                    if (userVos != null) {
+                    if (userVos != null && !userVos.isEmpty()) {
                         List<Long> ids = userVos.stream().map(User::getId).collect(Collectors.toList());
                         List<String> userNameList = userVos.stream().map(User::getUserName).collect(Collectors.toList());
                         vo.setCooperationUserIdList(ids);

src/main/java/com/fdkankan/ucenter/util/DateUserUtil.java

@@ -136,7 +136,7 @@ public class DateUserUtil {
     }
 
     public static void main(String[] args) {
-        System.out.println(SecurityUtil.MD5(":\u0011\u001B\u0018\u0015\u0007\u0011\u00064DGFE"));
+        System.out.println(SecurityUtil.MD5("\u000E\u001FLGDFEM"));
     }
 
     public static Date getHoursTime(Date date){

src/main/resources/mapper/ucenter/SceneProMapper.xml

@@ -30,7 +30,6 @@
         <include refid="sceneJoinCamera"></include>
         WHERE is_upgrade = 0 and  p.rec_status = 'A'
         <include refid="commonWhere"></include>
-        AND
         <include refid="commonSceneWhere"></include>
         <if test="param.sceneName !=null and param.sceneName !=''">
           and  p.scene_name like CONCAT('%',#{param.sceneName},'%')
@@ -46,7 +45,6 @@
         <include refid="sceneJoinCamera"></include>
         WHERE p.rec_status = 'A'
         <include refid="commonWhere"></include>
-        AND
         <include refid="commonSceneWhere"></include>
         <if test="param.sceneName !=null and param.sceneName !=''">
           and  p.title like CONCAT('%',#{param.sceneName},'%')
@@ -111,7 +109,7 @@
 
     <sql id="commonSceneWhere">
         <if test="param.sourceList !=null and param.sourceList.size >0">
-            scene_source in
+            AND scene_source in
             <foreach item="sourceId" collection="param.sourceList" open="(" separator="," close=")">
                 #{sourceId}
             </foreach>