From 5c63d3fa13956182f999a02ebd291161cf1b32bc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 03 一月 2025 18:22:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java                   |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java      |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java |   58 +++++++++++++++++++++--------
 server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java           |    5 +-
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java   |   12 ++++--
 server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java                    |   18 ++++----
 6 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java b/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
index 111543f..aca677e 100644
--- a/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/config/mybatis/MyBatisInterceptor.java
@@ -50,13 +50,13 @@
         if (target == null)
             return invocation.proceed();
         // 鍒涘缓璇彞
-//        if (SqlCommandType.INSERT == sqlCommandType) {
-//            this.handleOperaStatement(target, CREATE_TIME, CREATE_USER);
-//        }
-//        // 鏇存柊璇彞
-//        else if (SqlCommandType.UPDATE == sqlCommandType) {
-//            this.handleOperaStatement(target, UPDATE_TIME, UPDATE_USER);
-//        }
+        if (SqlCommandType.INSERT == sqlCommandType) {
+            this.handleOperaStatement(target, CREATE_TIME, CREATE_USER);
+        }
+        // 鏇存柊璇彞
+        else if (SqlCommandType.UPDATE == sqlCommandType) {
+            this.handleOperaStatement(target, UPDATE_TIME, UPDATE_USER);
+        }
         return invocation.proceed();
     }
 
@@ -79,14 +79,14 @@
                 this.setFieldValue(operaTimeField, target, new Date());
             }
         }
-        // 鎿嶄綔浜�
+       /* // 鎿嶄綔浜�
         Field operaUserField = ReflectionUtils.findField(target.getClass(), fieldNames[1]);
         if (operaUserField != null) {
             Object operaUser = this.getFieldValue(operaUserField, target);
             if (operaUser == null && this.getLoginUser()!=null)  {
                 this.setFieldValue(operaUserField, target, this.getLoginUser().getId());
             }
-        }
+        }*/
     }
 
     /**
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index f4928cc..b4b4f11 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -254,7 +254,8 @@
                     .set(SystemUser::getOpenidHkInfo,null)
                     .set(SystemUser::getOpenidHkStatus,Constants.ZERO)
                     .eq(SystemUser::getOpenid,openid)
-                    .eq(SystemUser::getType,user.getType()));
+//                    .eq(SystemUser::getType,user.getType())
+            );
             systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
                     .set(SystemUser::getOpenid,openid)
                     .set(SystemUser::getOpenidHkStatus,Constants.ZERO)
@@ -374,8 +375,6 @@
         }else{
             throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
         }
-
-
         String pwd = Utils.Secure.encryptPassword(new String(dto.getPassword()), user.getSalt());
         // 姣旇緝瀵嗙爜
         if( !StringUtils.equals(pwd, user.getPassword())){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
index 61779cf..287a693 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
@@ -135,7 +135,7 @@
         shwtg(4, 2,1,"杩愯緭鍗曞鏍搁�氳繃",null),
         sqzyzwc(5,6, 1,"鐢宠鍑嗚繍璇佸畬鎴�","杞﹁締鍑嗚繍璇佺敵璇峰畬鎴�" ),
         ddzhddzs(6,3,2,"鍒拌揪瑁呰揣鍦�-鐢靛瓙閿佹苯杩�","杞﹁締宸插埌杈捐璐у湴" ),
-        clqddzs(7, 4,2,"杞﹁締鍚繍-鐢靛瓙閿佹苯杩�","杞﹁締瑁呰揣瀹屾垚锛岀數瀛愰攣宸蹭笂閿�" ),
+        clqddzs(7, 4,2,"杞﹁締鍚繍-鐢靛瓙閿佹苯杩�","杞﹁締宸插惎杩�" ),
         clqdapp(8, 7,3,"杞﹁締鍚繍-APP","杞﹁締杩愯緭涓�" ),
         ddzhd(9, 8,4,"鍒拌揪鍗歌揣鍦�-APP","杞﹁締宸插埌杈惧嵏璐у湴" ),
         ddxhd(10, 5,5,"鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩�","鐢靛瓙閿佸凡瑙ｉ攣锛岃繍杈撲换鍔″凡瀹屾垚" ),
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index a426f9c..af87a83 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1765,7 +1765,7 @@
             //濡傛灉鏄徃鏈烘垨鑰呭唴閮ㄤ汉鍛橈紝鍒欎粠system_user鏌ヨ
             SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                     .eq(SystemUser::getOpenid,openId)
-                    .eq(SystemUser::getType,source)
+                    .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
                     .eq(SystemUser::getDeleted,Boolean.FALSE)
                     .last(" limit 1 "));
             //闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 23fe63a..29d38af 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -588,25 +588,46 @@
     public    List<AlarmEventDataVO> fightingAdminAlertList(){
         List<AlarmEventDataVO> data = new ArrayList<>();
 
-        //鏌ヨ24灏忔椂鍐呯殑
+        List<FindHomeAlarmInfoPageResponse> allList = new ArrayList<>();
+        boolean hasNext = true;
+        int curTotal = 0;
+        int curPage = 1;
         FindHomeAlarmInfoPageRequest param = new FindHomeAlarmInfoPageRequest();
         param.setHour(24);
-        param.setPage(1);
         param.setUserId("admin");
+        while (hasNext){
+            //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
+            param.setPage(curPage);
 //        param.setRegionIndexCodes("root000000");
-        param.setAlarmStartTime(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd") + " 00:00:00");
-        param.setAlarmEndTime(DateUtil.getPlusTime2(new Date()));
-        param.setPageSize(20);
-        BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> response = HKService.findHomeAlarmInfoPage(param);
-        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
-                && response.getData()!=null
-                &&response.getData().getList()!=null) {
+            param.setAlarmStartTime(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd") + " 00:00:00");
+            param.setAlarmEndTime(DateUtil.getPlusTime2(new Date()));
+            param.setPageSize(50);
+            BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> response = HKService.findHomeAlarmInfoPage(param);
+            if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+            }
             for(FindHomeAlarmInfoPageResponse r : response.getData().getList()){
                 AlarmEventDataVO t = new AlarmEventDataVO();
                 BeanUtils.copyProperties(r,t);
-                data.add(t);
+                try {
+                    if(DateUtil.getDateFromString(t.getAlarmTime()).getTime() >= Utils.Date.getStart(new Date()).getTime()){
+                        data.add(t);
+                    }else{
+                        hasNext =false;
+                    }
+                }catch (Exception e){
+                }
             }
+            curTotal += 50;
+            if(curTotal >= response.getData().getTotal()){
+                hasNext = false;
+            }
+            if(response.getData().getList() == null || response.getData().getList().size()==0){
+                hasNext =false;
+            }
+            curPage++;
         }
+
         return data;
 
     }
@@ -1380,14 +1401,19 @@
         }
         if( data.getGasQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
             //璁＄畻鐢ㄦ皵鍚屾瘮鐜瘮
-            data.getGasQuantity().setSameRate(
-                    (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getSameNum())).divide(data.getGasQuantity().getSameNum()).doubleValue()*100 +""
+            if(Constants.formatBigdecimal(data.getGasQuantity().getSameNum()).compareTo(new BigDecimal(0))!=0){
+                data.getGasQuantity().setSameRate(
+                        (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getSameNum())).divide(data.getGasQuantity().getSameNum(),4,BigDecimal.ROUND_HALF_UP).doubleValue()*100 +""
                     /*Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum()
                             .divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +""*/);
-            data.getGasQuantity().setRingRate(
-                    (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getRingNum())).divide(data.getGasQuantity().getRingNum()).doubleValue()*100 +""
-                    //Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +""
-            );
+            }
+           if(Constants.formatBigdecimal(data.getGasQuantity().getRingNum()).compareTo(new BigDecimal(0))!=0){
+               data.getGasQuantity().setRingRate(
+                       (data.getGasQuantity().getTotalNum().subtract(data.getGasQuantity().getRingNum())).divide(data.getGasQuantity().getRingNum(),4,BigDecimal.ROUND_HALF_UP).doubleValue()*100 +""
+                       //Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +""
+               );
+           }
+
         }
         if( data.getWaterQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
             // //璁＄畻鐢ㄦ按鍚屾瘮鐜瘮
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index 5854665..9132ddb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -168,6 +168,10 @@
             for(Integer t :statusList){
                 for(TmsCircleStatusListResponse status :data){
                     if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
+                            && Constants.equalsInteger(status.getType(),TMSContants.StatusCode.rggx)) {
+                         continue;
+                    }
+                    if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
                             && Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
                         status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getOrderStatus());
                     }
@@ -220,7 +224,7 @@
         String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                     +TMSContants.InterfacePath.getDriverTaskList[0];
 
-        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskList[0];
+//        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskList[0];
         TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskList[1],JSONObject.toJSONString(param)
                 ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse>>>(){});
         if(response ==null || response.getData() == null){
@@ -241,7 +245,7 @@
         String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                     +TMSContants.InterfacePath.getDriverTaskDetail[0];
 
-        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskDetail[0];
+//        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskDetail[0];
         TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskDetail[1],JSONObject.toJSONString(param)
                 ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
         if(response ==null || response.getData() == null){
@@ -261,7 +265,7 @@
         }
         String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                     +TMSContants.InterfacePath.driverStart[0];
-        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
+//        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
         TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverStart[1],JSONObject.toJSONString(param)
                 ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
         if(response ==null ||   !StringUtils.equals(response.getCode(),"0")){
@@ -283,7 +287,7 @@
         }
         String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                     +TMSContants.InterfacePath.driverArrival[0];
-        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
+//        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
         TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverArrival[1],JSONObject.toJSONString(param)
                 ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
         if(response ==null  ||!StringUtils.equals(response.getCode(),"0")){

--
Gitblit v1.9.3