Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   profiles:
-    active: test
+    active: prod
   resources:
     static-locations: file:///winsea/static/
   thymeleaf:
@@ -25,7 +25,7 @@ spring:
 #运行环境 1.开发环境 2.测试环境 3.生产环境
 com:
   yiliangyiyun:
-    env: 2
+    env: 3
 
 auth:
   anon-methods:

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/WarehouseView.java

@@ -123,4 +123,12 @@ public class WarehouseView {
     private Date updateDate;
 
     private String automaticWeightAcquisition;
+    /**
+     * 监控url1
+     */
+    private String monitorUrl1;
+    /**
+     * 监控url2
+     */
+    private String monitorUrl2;
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -202,6 +202,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
                         for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
                             WarehouseView warehouseView = new WarehouseView();
+                            warehouseView.setMonitorUrl1(warehouseBaseInfo.getMonitorUrl1());
+                            warehouseView.setMonitorUrl2(warehouseBaseInfo.getMonitorUrl2());
                             warehouseView.setAllowEdit(warehouseBaseInfo.getAllowEdit());
                             warehouseView.setWarehouseId(warehouseBaseInfo.getId());
                             warehouseView.setAutomaticWeightAcquisition(warehouseBaseInfo.getAutomaticWeightAcquisition());
@@ -325,6 +327,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
                 for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
                     WarehouseView warehouseView = new WarehouseView();
+
+                    warehouseView.setMonitorUrl1(warehouseBaseInfo.getMonitorUrl1());
+                    warehouseView.setMonitorUrl2(warehouseBaseInfo.getMonitorUrl2());
                     warehouseView.setWarehouseId(warehouseBaseInfo.getId());
                     warehouseView.setCreateType(warehouseBaseInfo.getCreateType());
                     warehouseView.setClearStatus(warehouseBaseInfo.getClearStatus());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/GeTuiUtils.java

@@ -127,13 +127,14 @@ public class GeTuiUtils {
                 notification1.setIntent("intent:#Intent;launchFlags=0x04000000;action=android.intent.action.oppopush;component=uni.UNI7297DA2/io.dcloud.PandoraEntry;S.UP-OL-SU=true;S.title=" + title + ";S.content=" + content + ";S.payload=test;end");
                 ups.setNotification(notification1);
                 //各厂商自有功能单项设置
-                ups.addOption("HW", "/message/android/notification/badge/class", "io.dcloud.PandoraEntry ");
+                ups.addOption("HW", "/message/android/notification/badge/class", "io.dcloud.PandoraEntry");
                 ups.addOption("HW", "/message/android/notification/badge/add_num", 1);
                 ups.addOption("HW", "/message/android/notification/sound", "/raw/ring");
                 ups.addOption("HW", "/message/android/notification/channel_id", "task2");
                 ups.addOption("HW", "/message/android/notification/importance", "NORMAL");
-                ups.addOption("HW", "/message/android/notification/category", "WORK");
+                ups.addOption("HW", "/message/android/category", "WORK");
                 ups.addOption("HW", "/message/android/notification/default_sound", false);
+//                ups.addOption("HW", "/message/android/target_user_type", 1);
                 ups.addOption("XM", "/extra.sound_uri", "android.resource://uni.UNI7297DA2/raw/task1");
                 ups.addOption("XM", "/extra.channel_id", "high_custom_5");
                 //ups.addOption("VV","classification",1);
@@ -250,13 +251,14 @@ public class GeTuiUtils {
                 notification1.setIntent("intent:#Intent;launchFlags=0x04000000;action=android.intent.action.oppopush;component=uni.UNI7297DA2/io.dcloud.PandoraEntry;S.UP-OL-SU=true;S.title=" + title + ";S.content=" + content + ";S.payload=test;end");
                 ups.setNotification(notification1);
                 //各厂商自有功能单项设置
-                ups.addOption("HW", "/message/android/notification/badge/class", "io.dcloud.PandoraEntry ");
+                ups.addOption("HW", "/message/android/notification/badge/class", "io.dcloud.PandoraEntry");
                 ups.addOption("HW", "/message/android/notification/badge/add_num", 1);
                 ups.addOption("HW", "/message/android/notification/sound", "/raw/ring");
                 ups.addOption("HW", "/message/android/notification/channel_id", "task2");
                 ups.addOption("HW", "/message/android/notification/importance", "NORMAL");
-                ups.addOption("HW", "/message/android/notification/category", "WORK");
+                ups.addOption("HW", "/message/android/category", "WORK");
                 ups.addOption("HW", "/message/android/notification/default_sound", false);
+//                ups.addOption("HW", "/message/android/target_user_type", 1);
                 ups.addOption("XM", "/extra.sound_uri", "android.resource://uni.UNI7297DA2/raw/task1");
                 ups.addOption("XM", "/extra.channel_id", "high_custom_5");
                 //ups.addOption("VV","classification",1);

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -389,34 +389,8 @@
         wo.goods_name AS goodsName,
         wo.in_type AS inType,
         cmi.point_out as pointOut,
-        (
-        SELECT
-        sum( wo1.surplus_weight )
-        FROM
-        warehousing_order wo1
-        WHERE
-        wo1.contract_no = wo.contract_no
-        AND wo1.comp_id = wo.comp_id
-        AND wo1.delete_flag = 0
-        AND wo1.surplus_weight > 0
-        AND wo1.warehouse_name = wo.warehouse_name
-        AND wo1.goods_name = wo.goods_name
-        AND wo1.in_type = wo.in_type
-        ) AS surplusWeight,
-        (
-        SELECT
-        ROUND( AVG( wo2.avg_cost ), 3 )
-        FROM
-        warehousing_order wo2
-        WHERE
-        wo2.warehouse_name = wo.warehouse_name
-        AND wo2.contract_no = wo.contract_no
-        AND wo2.goods_name = wo.goods_name
-        AND wo2.delete_flag = 0
-        AND wo2.comp_id = wo.comp_id
-        AND wo2.surplus_weight > 0
-        AND wo2.in_type = wo.in_type
-        ) AS avgCost,
+        sum( wo.surplus_weight )AS surplusWeight,
+        ROUND( AVG( wo.avg_cost ), 3 ) AS avgCost,
         wo.issuing_time AS issuingTimeElse,
         wo.issuing_time AS issuingTimeOther
         FROM