fix：sop监控统计

sop-api/src/main/java/com/qmth/sop/server/api/SopAnalyseController.java

@@ -92,6 +92,7 @@ public class SopAnalyseController {
     /*
      * 5.供应商预警均值走势：
      * 供应商近一周预警数的均值走势。
+     * ④（预警数）均值：由于供应商分配的项目数量不同，所以单从总数无法判定供应商对预警处理的力度。均值=预警总数/派单数；
      */
 
     @ApiOperation(value = "供应商预警均值走势接口")

sop-api/src/main/java/com/qmth/sop/server/api/SsoController.java

@@ -5,6 +5,7 @@ import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.service.SsoService;
 import com.qmth.sop.common.annotation.OperationLog;
 import com.qmth.sop.common.contant.SystemConstant;
+import com.qmth.sop.common.enums.ExceptionResultEnum;
 import com.qmth.sop.common.enums.LogTypeEnum;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
@@ -37,6 +38,7 @@ public class SsoController {
     @OperationLog(logType = LogTypeEnum.UN_KNOW)
     public Result analysisLogin() {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(ssoService.rtzfSsoLogin(requestUser));
+        return ResultUtil.ok("https://www.baidu.com/",ExceptionResultEnum.SUCCESS.getMessage());
+//        return ResultUtil.ok(ssoService.rtzfSsoLogin(requestUser));
     }
 }

sop-business/src/main/java/com/qmth/sop/business/bean/result/analyze/sopWarn/SopSupplierAvgView.java

@@ -0,0 +1,9 @@
+package com.qmth.sop.business.bean.result.analyze.sopWarn;
+
+/**
+ * @Description: sop供应商预警均值
+ * @Author: CaoZixuan
+ * @Date: 2023-11-12
+ */
+public class SopSupplierAvgView {
+}

sop-business/src/main/java/com/qmth/sop/business/service/SopAnalyseService.java

@@ -1,6 +1,7 @@
 package com.qmth.sop.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.sop.business.bean.result.analyze.sopWarn.SopSupplierAvgView;
 import com.qmth.sop.business.bean.result.analyze.sopWarn.SopWarnOverview;
 import com.qmth.sop.business.entity.TBService;
 import com.qmth.sop.business.entity.TBSopInfo;
@@ -20,7 +21,10 @@ public interface SopAnalyseService extends IService<TBSopInfo> {
 
     List<Map<String, Object>> processing(Long serviceId, SopAnalyseGroupEnum group, SopAnalyseSortEnum sort);
 
-    Map<Object, List<Map<String, Object>>> trend(Long serviceId);
+    @Deprecated
+    Map<Object, List<Map<String, Object>>> trend1(Long serviceId);
+
+    List<SopSupplierAvgView> trend(Long serviceId);
 
     List<Map<String, Object>> attendance(Long serviceId, SopAnalyseGroupEnum group);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/SopAnalyseServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.sop.business.bean.dto.DataPermissionDto;
 import com.qmth.sop.business.bean.result.analyze.sopWarn.SopMonitor;
 import com.qmth.sop.business.bean.result.analyze.sopWarn.SopMonitorEnum;
+import com.qmth.sop.business.bean.result.analyze.sopWarn.SopSupplierAvgView;
 import com.qmth.sop.business.bean.result.analyze.sopWarn.SopWarnOverview;
 import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBService;
@@ -273,7 +274,7 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
      * 供应商近一周预警数的均值走势。
      */
     @Override
-    public Map<Object, List<Map<String, Object>>> trend(Long serviceId) {
+    public Map<Object, List<Map<String, Object>>> trend1(Long serviceId) {
         List<Map<String, Object>> list = this.baseMapper.trend(serviceId);
 //        Map<Object, List<Map<String, Object>>> collect1 = list.stream().collect(Collectors.groupingBy(map -> map.get("click_date")));
 //        Map<Object, Map<Object, List<Map<String, Object>>>> collect = new HashMap<>();
@@ -282,6 +283,19 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
 
     }
 
+    /*
+     * 5.供应商预警均值走势：
+     * 供应商近一周预警数的均值走势。
+     * ④（预警数）均值：由于供应商分配的项目数量不同，所以单从总数无法判定供应商对预警处理的力度。均值=预警总数/派单数；
+     */
+    @Override
+    public List<SopSupplierAvgView> trend(Long serviceId) {
+        List<SopMonitor> sopMonitorList = this.baseMapper.findSopMonitorListByServiceId(serviceId);
+
+        return null;
+
+    }
+
     /*
       6.项目/大区/供应商考勤异常TOP：
       ①（异常）均值=异常总数/派单数；

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -379,3 +379,11 @@ UPDATE sys_privilege SET related = '1032,1035,1036,1037,1038' WHERE (id = '51');
 -- 2023-11-18
 ALTER TABLE t_b_ding
     ADD COLUMN sign_year VARCHAR(20) NOT NULL COMMENT '签到年份' AFTER task_id;
+
+-- 2023-11-23
+INSERT INTO sys_privilege (id, name, url, type, sequence, enable, default_auth, front_display) VALUES ('2053', '智能客服', 'aiCustomerManage', 'MENU', '11', '1', '0', '1');
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, enable, default_auth, front_display) VALUES ('2054', '智能客服', 'aiCustomerChildManage', 'MENU', '2053', '1', '1', '0', '1');
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2055', '软通智能客服单点登录', '/api/oss/rtzf/login', 'URL', '2054', '1', 'AUTH', '1', '1', '0');
+UPDATE sys_privilege SET related = '2055' WHERE (id = '2054');
+
+

sop-common/src/main/java/com/qmth/sop/common/util/DateDisposeUtils.java

@@ -2,6 +2,7 @@ package com.qmth.sop.common.util;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import com.qmth.sop.common.contant.SystemConstant;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
@@ -204,11 +205,25 @@ public class DateDisposeUtils extends DateUtils {
     }
 
     public static void main(String[] args) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTimeInMillis(System.currentTimeMillis());
-        String signYear = calendar.get(Calendar.YEAR) + "年";
-        String signDay = calendar.get(Calendar.MONTH) + 1 + "月" + calendar.get(Calendar.DATE) + "日";
-        System.out.println(signYear + signDay);
-        System.out.println(DateUtil.between(new Date(1700706600000L),new Date(1700712000000L), DateUnit.MINUTE));
+        List<Long> timeList = new ArrayList<>();
+
+        Date date = new Date();
+
+        for (int i = 0; i < 7; i++) {
+            int v = i + 1;
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(date);
+            calendar.add(Calendar.DAY_OF_MONTH,- v);
+            calendar.set(Calendar.HOUR_OF_DAY,24);
+            calendar.set(Calendar.MINUTE,0);
+            calendar.set(Calendar.SECOND,0);
+            calendar.set(Calendar.MILLISECOND,0);
+            Long endTime = calendar.getTimeInMillis();
+            timeList.add(endTime);
+        }
+
+        for (Long time : timeList) {
+            System.out.println(DateFormatUtils.format(time, SystemConstant.DEFAULT_DATE_PATTERN));
+        }
     }
 }