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

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/TotalCheckCompanyServiceImpl.java

@@ -80,6 +80,11 @@ public class TotalCheckCompanyServiceImpl implements TotalCheckCompanyService {
 
     @Override
     public Integer findMaxNormalDayByCompanyList(List<CompanyInfo> list) {
-        return totalCheckCompanyDAO.findMaxNormalDayByCompanyList(list);
+        Integer total = totalCheckCompanyDAO.findMaxNormalDayByCompanyList(list);
+        if (total == null){
+            return 0;
+        }else {
+            return total;
+        }
     }
 }

web/src/main/java/com/jpsoft/smart/modules/mobile/controller/HealthShowApiController.java

@@ -116,6 +116,8 @@ public class HealthShowApiController {
 
 
                 List<String> deviceNoList = new ArrayList<>();
+                //默认添加一个不存在的设备，以防止公司无设备时返回错误
+                deviceNoList.add("1");
                 for (CompanyInfo companyInfo1 : list) {
                     List<DeviceInfo> deviceInfoList = companyDeviceRelationService.findDeviceByCompanyId(companyInfo1.getId());
                     for (DeviceInfo deviceInfo : deviceInfoList) {
@@ -243,6 +245,8 @@ public class HealthShowApiController {
             if (companyList.size() > 0) {
                 List<String> deviceNoList = new ArrayList<>();
 
+                //默认添加一个不存在的设备，以防止公司无设备时返回错误
+                deviceNoList.add("1");
                 for (CompanyInfo companyInfo1 : companyList) {
                     List<DeviceInfo> deviceInfoList = companyDeviceRelationService.findDeviceByCompanyId(companyInfo1.getId());
                     for (DeviceInfo deviceInfo : deviceInfoList) {
@@ -332,6 +336,8 @@ public class HealthShowApiController {
 
 
                 List<String> deviceNoList = new ArrayList<>();
+                //默认添加一个不存在的设备，以防止公司无设备时返回错误
+                deviceNoList.add("1");
                 for (CompanyInfo companyInfo1 : list) {
                     List<DeviceInfo> deviceInfoList = companyDeviceRelationService.findDeviceByCompanyId(companyInfo1.getId());
                     for (DeviceInfo deviceInfo : deviceInfoList) {
@@ -470,6 +476,8 @@ public class HealthShowApiController {
 
 
                 List<String> deviceNoList = new ArrayList<>();
+                //默认添加一个不存在的设备，以防止公司无设备时返回错误
+                deviceNoList.add("1");
                 for (CompanyInfo companyInfo1 : list) {
                     List<DeviceInfo> deviceInfoList = companyDeviceRelationService.findDeviceByCompanyId(companyInfo1.getId());
                     for (DeviceInfo deviceInfo : deviceInfoList) {

web/src/main/resources/application-production.yml

@@ -70,5 +70,18 @@ wx:
         token: 111
         aesKey: 111
 
+#可支付环境（小鹏物业app）
+parkalipay:
+  serviceUrl: https://openapi.alipay.com/gateway.do
+  appId: 2019031663559245
+  privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDP1o0XIBiHlNhBamD+8KMFUuyc4R8pAZAmfDlyCKsC+fZNGLEtENroGGMkLw0RiB+exuXbwFkJEpcf2FtU/RECG27zL9r2JHjL6Z4jtNW5JGNK+ScIYUIacOLCAmGyOKPKUnxtqCtrn/m3WPO8ouucnqQIUc1pR9QA5EM8/Y1ckRzQcjSkzIK7caqxdN2L84YiXFSD7q7t1tCb6t2OoiPl4jgnzSrX6EwtBTdKnatahhrFseODyGdZUTNRVFWKss26m3U+oBLQUrIDfx6XYvDgPSR7dz1g4syenj0iI8TBsmgKyo0oufoGpeAOmAjTK4//KcqYqgWwaWDUE/Vfq20/AgMBAAECggEALs4rkgSpYYc0uG6jj2ZT4DQPkzjjkpGGjBQ3v6WSFaaDQFOKOxLrqY8sbI6oC8WzEUfLphSIOJHWNNa9osMnHGlfMCcb0YjfJ1TiRzpHU12NeunnT2zPvTKk7noo1EELKdovqWZQ+Pja/N5sbZPnKatUV4dMkiQZ62V8evTC7BBdxyeA1Ivg2uj1id0G7uLVhoPTuqn0+FHid8r3sSaPHKcY9hfGVat7WgQQoqGurBuJrLP4RTzyaHN3OxuZzMnSu6q7zhMpfBZK0xsrA2+D3pHPdsnOt6fKnDCBdaXsumonQEuJFmLqOjyYCqZLDrfp41E+Tj6enDuGamN/9f1HkQKBgQD6Mbm9IMab3nG8rKnJBQTMJmZryCgDm/RZtqlAnIxgk10lkF77KRy2ZVU0/zcwa8BK7Ah6sQHE0rQ/OxjUrRj7PBv0CKkm6FpVoLZVtWdNBkJQsAbU7sB0cIM9r7QHvRzxHYzS8V3pkCEHvvOmyNQ3b6S0cHasI2ILMHgYChFXJwKBgQDUqTWqdUjZD1+z94gYke76w1bZGMmJnPDCvChZjpIFP5M3PSt3+HJgqPHA/ptg1OPJ2DX+dUNsZsTsM71jDz/yax1+zZkgIO+nsUWrTGek7Oi8THdoICa1++xhL3WcpUXxIl+l9U75qyXW9DV/zggr1x6DQDU1UaunMsvRg4LIKQKBgQDXZJnYNfBmXkIiwa9GDVkM/H4uilnQiaH63mOl6WB9AEEvxrPOnJ1IdcK+Zn235PveRIgkQGEadp+Q1CrTZdZc7GnQVOhzQ5QJpdtzvEGbsSjEWFb5WDY9yGNkZvChvPC+r8b+D6ffHSMijQUscDcrJqVwZmX0Wl3c7jRl1b0J/wKBgQC1hd4WK1jMVxAk6SSVfHPWPskyNLNLMNheEQgMMeM4caTy4Nbq5/qRwYPibjIo/G+XymOEWYn8zNhImn2NQeYewgoCQ/Lx9ss6g9npNyW9JLAgktDV46PHcUu7RSyKUpUaGHI2kecgvFNnYTsNZcuZyFz2QedpJNZ1uKk7pJsMyQKBgDNatWHVOJez9MAwAzpIDM90vdm79nzTUQ5NzanroGLGPTzREYLyw7F4mB035D34DVeUPgRDy0RHSK0kdA/HHtvcr6ONVummXXBEKaGKC3KvFHf1EXMVI0iA9nB70BCjkokFegqeTexlC3bkEZiMT2iWdK8rdBakd1ITIAsLE9AO
+  zfbPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo3gaIrAD47mfSBmye1c8GLIRF4H3sl0MhT1OHIO0FqwtDqyxpHkrpOQADQggEzgv1nO82V+ChQxHUeaQ7W987+s1cnwtm7ZVML8DxVtji1va1ahBKL62dBommOoIt4fRIO2upbnF6r3NjB/3MCTZUIE03xIqc+aUeNdRO7eAMpm6sHjBfSimFwXlyTaEsAsnTK4hkOzdvoldHry6A3375kE3msj8Z48Nko7AFedOToPfJNolap+i7qWv3VOhnWLrAZH/Jgq/uHQmx8r29BeBl9AT4EwxDN5mVVKDOYsWW1efmrhKXO3wvzInhB6qQ8L1uBCWKhw1eGHCvlCjTHxBYQIDAQAB
+  inputCharset: UTF-8
+  mchId: 2088511854331096
+  # appAuthToken: 201906BBbc7d6558596f4bbc9f056c01b8aebX48
+  signType: RSA2
+  format : json
+  notifyUrl: http://zldb.xiaoxinda.com:8088/smart-community-server/aliPay/payNotify
+
 mobile:
   unMeasureUrl: http://wisdomhousewechat.sudaonline.net/prevention/adundetect_wx_message.html