增加ai统计界面的金额显示和金额统计

fs-admin/src/main/java/com/fs/fastGpt/FastgptEventLogTotalController.java

@@ -89,8 +89,8 @@ public class FastgptEventLogTotalController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FastgptEventLogTotal fastgptEventLogTotal)
     {
-        List<FastgptEventLogTotal> list = fastgptEventLogTotalService.selectFastgptEventLogTotalList(fastgptEventLogTotal);
-        ExcelUtil<FastgptEventLogTotal> util = new ExcelUtil<FastgptEventLogTotal>(FastgptEventLogTotal.class);
+        List<FastgptEventLogTotalVo> list = fastgptEventLogTotalService.selectFastgptEventLogTotalExport(fastgptEventLogTotal);
+        ExcelUtil<FastgptEventLogTotalVo> util = new ExcelUtil<FastgptEventLogTotalVo>(FastgptEventLogTotalVo.class);
         return util.exportExcel(list, "ai事件埋点统计数据");
     }
 

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseVideoMapper.java

@@ -270,10 +270,10 @@ public interface FsUserCourseVideoMapper extends BaseMapper<FsUserCourseVideo> {
     @MapKey("videoId")
     Map<Long, FsUserCourseVideo> selectAllMap();
 
-    @Select("select * from fs_video_resource where line2 is not null and (job_id is null or job_id='')")
+    @Select("select * from fs_video_resource where video_url is not null and line2 is not null and (job_id is null or job_id='')")
     List<FsVideoResource> selectVideoByHuaWei();
 
-    @Select("select * from fs_video_resource where job_id is not null and  (hsy_vid is null or hsy_vid='')")
+    @Select("select * from fs_video_resource where video_url is not null and job_id is not null and  (hsy_vid is null or hsy_vid='')")
     List<FsVideoResource> selectVideoByJobId();
 
 

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -2633,8 +2633,15 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         if (!EXCLUDE_PROJECTS.contains(signProjectName) && !CloudHostUtils.hasCloudHostName("弘德堂")) {
             log.error("进入了看课限制：传入参数：={}，watchCourseVideo={}",param, watchCourseVideo);
             Integer logCount = fsUserCourseMapper.selectTodayCourseWatchLogCountByUserIdAndProjectId(param.getUserId(), courseProject);
-            if (Objects.isNull(watchCourseVideo) && logCount > 0) {
-                return ResponseResult.fail(ExceptionCodeEnum.EXCEED_COURSE_LIMIT.getCode(), ExceptionCodeEnum.EXCEED_COURSE_LIMIT.getDescription());
+            if (CloudHostUtils.hasCloudHostName("四川致医") ) {
+                if (Objects.isNull(watchCourseVideo) && logCount > 1) {
+                    return ResponseResult.fail(ExceptionCodeEnum.EXCEED_COURSE_LIMIT.getCode(), ExceptionCodeEnum.EXCEED_COURSE_LIMIT.getDescription());
+                }
+            } else {
+                // 其他情况保持原有逻辑
+                if (Objects.isNull(watchCourseVideo) && logCount > 0) {
+                    return ResponseResult.fail(ExceptionCodeEnum.EXCEED_COURSE_LIMIT.getCode(), ExceptionCodeEnum.EXCEED_COURSE_LIMIT.getDescription());
+                }
             }
         }else {
             log.error("没有进入看课限制：传入参数：={}，watchCourseVideo={}存在问题 ",param, watchCourseVideo);

fs-service/src/main/java/com/fs/fastGpt/mapper/FastgptEventLogTotalMapper.java

@@ -90,4 +90,7 @@ public interface FastgptEventLogTotalMapper extends BaseMapper<FastgptEventLogTo
     int updateFastgptEventLogTotalBatch(@Param("list") List<FastgptEventLogTotal> fastgptEventLogTotalList);
 
     List<FastgptEventLogTotalVo> selectFastgptEventLogTotalListByStatTime(@Param("dateTime") String dateTime);
+
+    List<FastgptEventLogTotalVo> selectFastgptEventLogTotalExport(FastgptEventLogTotal fastgptEventLogTotal);
+
 }

fs-service/src/main/java/com/fs/fastGpt/service/IFastgptEventLogTotalService.java

@@ -93,4 +93,6 @@ public interface IFastgptEventLogTotalService extends IService<FastgptEventLogTo
     List<FastgptEventLogTotalVo> selectFastgptEventLogTotalListByStatTime(String dateTime);
 
     void eventLogTotals(String startTime, String endTime);
+
+    List<FastgptEventLogTotalVo> selectFastgptEventLogTotalExport(FastgptEventLogTotal fastgptEventLogTotal);
 }

fs-service/src/main/java/com/fs/fastGpt/service/impl/FastgptEventLogTotalServiceImpl.java

@@ -331,6 +331,12 @@ public class FastgptEventLogTotalServiceImpl extends ServiceImpl<FastgptEventLog
         }
     }
 
+    @Override
+    public List<FastgptEventLogTotalVo> selectFastgptEventLogTotalExport(FastgptEventLogTotal fastgptEventLogTotal) {
+        return fastgptEventLogTotalMapper.selectFastgptEventLogTotalExport(fastgptEventLogTotal);
+    }
+
+
     private void processEventLogTotals(Date date, String dateTime) {
         FastgptEventLogTotal logTotal = new FastgptEventLogTotal();
         logTotal.setCreateTime(date);

fs-service/src/main/java/com/fs/fastGpt/vo/FastgptEventLogTotalVo.java

@@ -66,5 +66,8 @@ public class FastgptEventLogTotalVo extends BaseEntity{
 
     private List<String> roleIds;
 
+    @Excel(name = "金额")
+    private String money;
+
 
 }

fs-service/src/main/resources/mapper/fastGpt/FastgptEventLogTotalMapper.xml

@@ -130,6 +130,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY fe.company_id
         order by fe.company_id
     </select>
+    <select id="selectFastgptEventLogTotalExport" resultType="com.fs.fastGpt.vo.FastgptEventLogTotalVo">
+        select f.stat_time statTime,c.company_id companyId,c.company_name companyName,sum(f.count) count,(sum(f.count) / 100000) money
+        FROM `fastgpt_event_log_total` f left join company c on c.company_id = f.company_id
+        where f.type = 11
+        <if test="beginTime != null and endTime != null"> <![CDATA[and DATE_FORMAT(f.stat_time, '%Y-%m-%d') >= DATE_FORMAT(#{beginTime}, '%Y-%m-%d')
+                                                                 and DATE_FORMAT(f.stat_time, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d') ]]></if>
+
+        GROUP BY f.stat_time order by f.stat_time
+    </select>
 
     <insert id="insertFastgptEventLogTotal" parameterType="FastgptEventLogTotal" useGeneratedKeys="true" keyProperty="id">
         insert into fastgpt_event_log_total