Merge remote-tracking branch 'origin/dev' into dev

server-api/src/main/java/com/makeit/api/external/util/RSAUtils.java

@@ -29,23 +29,24 @@ public class RSAUtils {
     public static final String RSA_ALGORITHM = "RSA";
     public static final String RSA_ALGORITHM_SIGN = "SHA256WithRSA";
 
-    public static final String PRIVATE_KEY = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDEjW_RLCPPCeAPWzQWIAwMGNvHf1pat27oH6CZDCG5nLwxyDsUgxdF89IB2_rLURVTkkrB5tq_dcBk5Wi2pmu2yMn8Dpk2XYsm0LJwJe3gg2qqRXQm8DGbf9kvtHUqBLe_24PMHL88YavJdrcS6HNlwwth2YINmViroqMZgqW4bQnmV4t5X4BO1dl3gTB5y8pRXd1zoKsLNgjzbuVBgieA0-e99eMsdjJadZFPzETQW-BO9Q6Kbbx4fIjOkqxiS8KzsiDSvf3KXG9lfvoz67vuNez_QBFauA_MJsUP_bgHLXFV9-XzcjCE2fkDbKbNHPAP20o1IM1S3G43mGzRwAb5AgMBAAECggEAV_nOsNuG86bB6V2zRKv3eHqv9O2l7bDpLXDqm1Z4yfHDsqyi9R1wD1mBCGAEM3kJiKyUVZIVG1mDUiX05rw6vkfFUNLf9RuNq0QCenwfqzxnQ-tuf_dG3Qkul1G4l6Qg8vk4VuYPGuHE2JoQe6Ab9tKEh7mpopievcRAKKz3rEIn4NGGfg4tlTP2hoZ_EhCDMc02UTtjm2YXUux2T2KLZPXMeClbxU1vTMTxFNp9edWyB9syLbfJp34lrnrueKnqpBPUI4oldKj-3QsE4v3Ie8wLTp5leiowzKqZUXqTplWAvROpIvVfj9eeouBPAz_IQR_U77c3m22cisCh-5QT-QKBgQD764Um0miLVQQIrfM9GQiWpiiM75nzmt4QaRkjoNg896b-qjDelG9K_EQ3RjopFuQBKBf7xY304qtD6nY_5IFRlhdB58nrSgPgSxLaShAQ2yUkdDPr00rDBu_9cAT9GZxSRmDhds-87rnz21QMNIofg2cpKNpl1HQQfTcFN9OETwKBgQDHvFvQ0bizfkh4o71pfD0tiiWEeQzV7KMjuwQ3nnUBfgv2Rd1QkOUo3x_dLBTRzacIslQ3DFljXqoBJWJasRFUSAyikR1KUAven7z5D3u-rdye6MLofKkf0YY_qAlNQXEDh9hzhlWqifd4UJTcZujVQNvkuvjldGnMMTK1W49GNwKBgBUbZ52YFYBPEDZ19KJS3aBZrZ4ZWSnK-P4hACU3DccV7Nz7f3q2rxh2SHTlImxc6Z-bL1897yXsc_MNyviRebBPRgWUmRtoqSh6wcqeV_hBlDwYrFz-6A2tICB46UIXijxufyGE5eTrj5L59nHLWSNIzDTroljT0yGqjBiY09ULAoGAN339hGbACh5rxBi55zS9Som3Irb--fBk4uhyo4FCwMdkS2fdtSSMhm53S9uTbTbV0XS6MREdRJ5oXSklykyno-Lgn8nxeVQD-DYpKolCuBdV1FCW1kDMPCraQZVOAEjOPUzgtjf8VQU_3A2HTjTJO3ZpoYLQ4-8T9cc1b22gwMECgYBCq2CPsNMSf55_VCD23b2B_PuppnowWw-k_zl4MkZGLtLJx5qsLRp-hNRvqW2t81fFkOieDdGg_6s7DPinwKfjH8KNgv7ke3kv9euiJ-AmF8HQKlRNCsX_-J7JeB39BHZXU9WPRI4YT8dR6NzZS3D_ug_Coeiq9TIFa2Za6Q6mXg";
+    public static final String PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDOQEOR73MVcKL6pMROood6gpq-NGJgSC_q07Zj4KEa81jL8yt9x32vn97-zoGjaq_5R22rPBM-ou1czekvrgs1-XDunyRwXb6yzD83Z8T8AykqWPY1t0YnAXhck-uNWyeJPIsNBQWT38HOywxHUB21Mly8G1dEF4uRUs2fB--XZ78tw1QPl-1DHwIthHelnFTlSCQcxFXEI-vGFPpStvHZ3eNM1tTei8IkNsTimsl3EGgta355pEv6PpSNnGpv_TVzq3Uto5qD4p2VCv2OL96bUN3iLlSOSOz7axi_HHTBau2JEzPZ05kztlMOkwAgdox3fHbI9oayPYIMnsq_1tVLAgMBAAECggEAODXRdINixPQWpuKi0Z9_9saDb9UM_pqN3Jzod13v6k1p5OOX9caZnXSfrKgRMr1PyktKO0G7KPX0ZLeFlsYDLimWOqJKpwkVgNsjW3E_gUNHQ9BNAaS6TMUczXZO2w59vuwuJVU6COwRgM9bwE-4WPqpxWZaKSeVlPyRJ4ddJ9DUHKfugsNxFVKfAKs6TqaF6epOZQLSS6hsX33ZCT7PiYwOp_lltdCNb9IWNu9FhL5H8RqmmruW_9lIrdOYBvLS5R5dYUBZNvSAi0UgaYxfk6q26hyHZnFln1npZDhLnIL5QF2R6eXYa5sgILedToEWvhmTt0kzmnTGXID1sBLsGQKBgQDyvWgGWboCxe5vkwtFNL0Fsh5h4vjyN-o0icYR1VINhTSwJ6beIPWsN9sHrTS2GLDUdhn2o8nkImmJ8GEfQ_ylqdRuYbOSN9DgmwnDJjT2-Pun0QKAKwa5BV4WQbwPTBNpZE85dVU-K0Wam9tcJ3nQQSDHbijQ57RH0J1MPQ33jwKBgQDZhJRq9DOK_gSjPWC-1VzbhuvkuHOGFUuH94V-oCr9dyqCIimPwXAkkO-CxeVnFkDHtdkYa5Jmpa1jmwjmuBgZOjwfq3LmRDgK-sE8fTXPrum4bWWn078DUaFjPCbo0nunIBh3cMBs_FI5UUhJsBzzuJFoR6CXe2JjTvpeNDtIhQKBgDJjJsjKr1YMCCaY-2nuPJ6GDtB68Po2qSMmxjrFcTblQ76dPII3jUemgIzjY2G5VluD-He-IBZ_HjFH-KEo17T7v-D53vCnLXCyPiCIOc5aeMKpHD_GrqqRdqpgEs2KGS1zaQ6gUIWLLfOeDrbeaubT3h4Hu-lBb6bIox5EPjX5AoGAXE04NdJ-dMKp8SNAhHpBtx4fx6TF0OYEcSQFz9_jnj8NGL-qZ0gscDfYiuOzHvWAc76k6wnqzAgN9bB6LH1-LGZb0QyN60yTg4U4rpRrWz_cCdjSRE9ERQJEu7lwwWdf9WFXQIfl_9lqgswNIsfK4Vk2ystqSB2heIaxE3ySk4kCgYEA5g75I3C0UDCLqpft_VJKlmMGm7LaitXznt2ywsaCOPmPpuuz-mGsWeR2FSXol6lLKxarxrCI2llKi8PaarRyoHLnVBkwGxRtJptuyLvrJncpeQwRmY9gxnx3J73y_EXymJxAx1jigkZH0F1T5UA-xJ8wdbGd5y_UE1MEKbCKvHg";
 
-    public static final String PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxI1v0SwjzwngD1s0FiAMDBjbx39aWrdu6B-gmQwhuZy8Mcg7FIMXRfPSAdv6y1EVU5JKwebav3XAZOVotqZrtsjJ_A6ZNl2LJtCycCXt4INqqkV0JvAxm3_ZL7R1KgS3v9uDzBy_PGGryXa3EuhzZcMLYdmCDZlYq6KjGYKluG0J5leLeV-ATtXZd4EwecvKUV3dc6CrCzYI827lQYIngNPnvfXjLHYyWnWRT8xE0FvgTvUOim28eHyIzpKsYkvCs7Ig0r39ylxvZX76M-u77jXs_0ARWrgPzCbFD_24By1xVffl83IwhNn5A2ymzRzwD9tKNSDNUtxuN5hs0cAG-QIDAQAB";
+    public static final String PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzkBDke9zFXCi-qTETqKHeoKavjRiYEgv6tO2Y-ChGvNYy_Mrfcd9r5_e_s6Bo2qv-UdtqzwTPqLtXM3pL64LNflw7p8kcF2-ssw_N2fE_AMpKlj2NbdGJwF4XJPrjVsniTyLDQUFk9_BzssMR1AdtTJcvBtXRBeLkVLNnwfvl2e_LcNUD5ftQx8CLYR3pZxU5UgkHMRVxCPrxhT6Urbx2d3jTNbU3ovCJDbE4prJdxBoLWt-eaRL-j6UjZxqb_01c6t1LaOag-KdlQr9ji_em1Dd4i5Ujkjs-2sYvxx0wWrtiRMz2dOZM7ZTDpMAIHaMd3x2yPaGsj2CDJ7Kv9bVSwIDAQAB";
 
     public static void main(String[] args) throws Exception {
         Map<String, String> keys = createKeys(2048);
-        System.out.println("privateKey:" + keys.get("privateKey"));
-        System.out.println("publicKey:" + keys.get("publicKey"));
+        System.out.println("privateKey:" + PRIVATE_KEY);
+        System.out.println("publicKey:" + PUBLIC_KEY);
 
         RSAPublicKey publicKey = getPublicKey(PUBLIC_KEY);
-
+        System.out.println("------------");
         String encrypt = publicEncrypt("{\"page\":1,\"limit\":10,\"data\":{}}", publicKey, "UTF-8");
         System.out.println(encrypt);
 
 
         RSAPrivateKey privateKey = getPrivateKey(PRIVATE_KEY);
         String decrypt = privateDecrypt(encrypt, privateKey, "UTF-8");
+        System.out.println("------------");
 
         System.out.println(decrypt);
 

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java

@@ -257,7 +257,9 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             }).collect(Collectors.toList());
 
             spaceNoPersonFlag = voList.stream().allMatch(e -> e.getPersonState() == 0);
-
+            if (spaceNoPersonFlag) {
+                continue;
+            }
             Double[] doubleArrX = voList.stream().map(PlatElderCoordinateVO::getX).toArray(Double[]::new);
             double x = StandardDeviationUtil.variance(doubleArrX);
             boolean xFlag = new BigDecimal(x + "").compareTo(new BigDecimal(2)) > 0;
@@ -305,6 +307,9 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
             boolean xFlag = false;
             fallNoPersonFlag = voList.stream().allMatch(e -> e.getPersonState() == 0);
+            if (fallNoPersonFlag) {
+                continue;
+            }
             Double[] doubleArrX = voList.stream().map(PlatElderCoordinateVO::getX).filter(Objects::nonNull).toArray(Double[]::new);
             if (doubleArrX.length > 0) {
                 double x = StandardDeviationUtil.variance(doubleArrX);

server-service/src/main/java/com/makeit/service/saas/impl/SaasSleepAnalysisModelServiceImpl.java

@@ -22,6 +22,7 @@ import java.time.LocalDateTime;
 import java.util.concurrent.TimeUnit;
 
 import static com.makeit.service.platform.elder.impl.PlatElderRealTimeServiceImpl.SLEEP_ANALYSIS_KEY;
+import static com.makeit.service.platform.elder.impl.PlatElderRealTimeServiceImpl.SLEEP_ANALYSIS_THRESHOLD_KEY;
 
 /**
  * <p>
@@ -61,6 +62,7 @@ public class SaasSleepAnalysisModelServiceImpl extends ServiceImpl<SaasSleepAnal
         saasModelManageService.updateEntity(dto.getId(),"sleep");
 
         redisTemplate.opsForValue().set(SLEEP_ANALYSIS_KEY,entity.getSleepTimeActionDuration(),1, TimeUnit.DAYS);
+        redisTemplate.opsForValue().set(SLEEP_ANALYSIS_THRESHOLD_KEY,entity.getSleepTimeActionThreshold(),1,TimeUnit.DAYS);
 
     }
 }