aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/3.0' into dev/dev_xp

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/mapper/primary/DesignMapper.java
#	src/main/resources/mapper/primary/DesignMapper.xml
This commit is contained in:
xupei
2024-03-06 21:00:07 +08:00
parent e84d800ba0 a016f16052
commit bf05f88c00
8 changed files with 104 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/application-prod.properties
View File

@@ -15,7 +15,7 @@ spring.security.jwtTokenPrefix=Bearer-
spring.security.jwtExpiration=8640000000
#spring security权限设置 认证了token还要认证权限 不然报错Full authentication is required to access this resource
spring.security.ignorePaths=/,/favicon.ico,/doc.html,/webjars/**,/swagger-resources,/v2/api-docs,\
/api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/**,/api/workspace/**,/api/classification/**
/api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/**,/api/workspace/**,/api/classification/**,/api/inquiry/**
spring.security.authApi=/auth/login

14
src/main/resources/mapper/primary/DesignMapper.xml
View File

@@ -26,4 +26,18 @@
#{createDate});
</insert>
<select id="getDesignStatistic" resultType="com.ai.da.model.dto.UserDesignStatisticDTO" parameterType="String">
select a.account_id,count(a.account_id) use_design_times,b.user_email,b.user_name,b.is_trial
from t_design a
left join `t_account` b
on a.account_id = b.id
<where>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
a.create_date between #{startTime} and #{endTime}
</if>
</where>
GROUP BY a.account_id
ORDER BY a.account_id ASC;
</select>
</mapper>