c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-11-07 11:56:13 +08:00
parent 90026a54a3
commit ae86803b17
17 changed files with 381 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/base/utils/DistanceUtils.java → src/main/java/com/budwk/app/base/utils/DistanceUtil.java
+1 -1
View File
@@ -7,7 +7,7 @@ package com.budwk.app.base.utils;
* @Version 1.0
* @Description TODO
*/
public class DistanceUtils {
public class DistanceUtil {
private static final double EARTH_RADIUS = 6371000; // 地球半径，单位：米
src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityStatisticsServiceImpl.java
+1 -1
View File
@@ -194,7 +194,7 @@ public class FamilyActivityStatisticsServiceImpl extends BaseServiceImpl<FamilyU
// 使用Stream API进行降序排序
Map<String, List<NutMap>> sortedDataMap = courseTimeMap.entrySet().stream()
.sorted(Map.Entry.comparingByKey(Comparator.reverseOrder()))
.sorted(Map.Entry.comparingByKey(Comparator.naturalOrder()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
return sortedDataMap;
src/main/java/com/budwk/app/zhgh/activity/fellowship/service/impl/FellowshipActivityStatisticsServiceImpl.java
+12 -9
View File
@@ -101,14 +101,17 @@ public class FellowshipActivityStatisticsServiceImpl extends BaseServiceImpl<Fel
cnd.andEX("tsuu.courseId", "=", courseId);
sql.setCondition(cnd);
List<NutMap> list = listMap(sql);
list.forEach(o -> {
List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
if(Lang.isNotEmpty(mobileColumnsValue)) {
mobileColumnsValue.forEach(m -> {
o.put(m.getString("columnCode"), m.getString("columnValue"));
});
}
});
for (NutMap o : list) {
if(StrUtil.isBlank(o.getString("mobileColumnsValue"))) {
continue;
}
List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
if(Lang.isNotEmpty(mobileColumnsValue)) {
mobileColumnsValue.forEach(m -> {
o.put(m.getString("columnCode"), m.getString("columnValue"));
});
}
}
return list;
}
@@ -185,7 +188,7 @@ public class FellowshipActivityStatisticsServiceImpl extends BaseServiceImpl<Fel
// 使用Stream API进行降序排序
Map<String, List<NutMap>> sortedDataMap = courseTimeMap.entrySet().stream()
.sorted(Map.Entry.comparingByKey(Comparator.reverseOrder()))
.sorted(Map.Entry.comparingByKey(Comparator.naturalOrder()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
return sortedDataMap;
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainsignUpMineController.java
+8 -12
View File
@@ -6,9 +6,8 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.DistanceUtils;
import com.budwk.app.base.utils.DistanceUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpCourse;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpUserCourse;
@@ -27,7 +26,6 @@ import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -85,13 +83,13 @@ public class TrainsignUpMineController {
}
TrainSignUpCourse course = dao.fetch(TrainSignUpCourse.class, courseId);
List<Double> coordinates = course.getCourseLocationCoordinates();
List<Double> coordinates = course.getTransPosition();
int minute = course.getSignUnit() != null ? course.getSignUnit() : 0;
int radius = course.getRadius() != null ? course.getRadius() : 100;
boolean flag = true;
// 获取现在的日期，并根据设置的数据
List<TrainSignUpUserCourse> timeList = dao.query(TrainSignUpUserCourse.class, Cnd.where("courseId", "=", courseId));
List<TrainSignUpUserCourse> timeList = dao.query(TrainSignUpUserCourse.class, Cnd.where("courseId", "=", courseId).and("userId", "=", SecurityUtil.getUserId()));
for (TrainSignUpUserCourse userCourse : timeList) {
DateTime startTime = DateUtil.offsetMinute(userCourse.getCourseStartTime(), -minute);
DateTime endTime = DateUtil.offsetMinute(userCourse.getCourseEndTime(), minute);
@@ -105,10 +103,9 @@ public class TrainsignUpMineController {
return Result.error(99, "未到签到时间");
}
double distance = DistanceUtils.getDistance(coordinates.get(0), coordinates.get(1), lat, lng);
double distance = DistanceUtil.getDistance(coordinates.get(0), coordinates.get(1), lat, lng);
if(distance > radius) {
int result = BigDecimal.valueOf(distance).setScale(0, RoundingMode.HALF_UP).intValue();
return Result.error(99, "签到失败，您距离签到点还有%s米".formatted(result));
return Result.error(99, "签到失败，您距离签到点还有%.1f米".formatted(distance - radius));
}
dao.update(timeList);
@@ -152,7 +149,7 @@ public class TrainsignUpMineController {
@SLog(tag = "品牌活动-定位签到", msg = "定位签到")
public Result positionSign(String courseId, String timeId, Double lat, Double lng) {
TrainSignUpCourse course = dao.fetch(TrainSignUpCourse.class, courseId);
List<Double> coordinates = course.getCourseLocationCoordinates();
List<Double> coordinates = course.getTransPosition();
int minute = course.getSignUnit() != null ? course.getSignUnit() : 0;
int radius = course.getRadius() != null ? course.getRadius() : 100;
@@ -164,10 +161,9 @@ public class TrainsignUpMineController {
return Result.error(99, "未到签到时间");
}
double distance = DistanceUtils.getDistance(coordinates.get(0), coordinates.get(1), lat, lng);
double distance = DistanceUtil.getDistance(coordinates.get(0), coordinates.get(1), lat, lng);
if(distance > radius) {
int result = BigDecimal.valueOf(distance).setScale(0, RoundingMode.HALF_UP).intValue();
return Result.error(99, "签到失败，您距离签到点还有%s米".formatted(result));
return Result.error(99, "签到失败，您距离签到点还有%.1f米".formatted(distance - radius));
}
userCourse.setAttend(true);
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java
+29 -6
View File
@@ -16,10 +16,7 @@ import com.budwk.app.sys.models.Sys_file;
import com.budwk.app.sys.utils.SysFileMinIoUtil;
import com.budwk.app.web.commons.auth.utils.AuthUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainMobileSignColumn;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpActivity;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpCourse;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpType;
import com.budwk.app.zhgh.activity.trainSignUp.models.*;
import com.budwk.app.zhgh.activity.trainSignUp.service.TrainSignUpActivityService;
import com.budwk.app.zhgh.activity.trainSignUp.service.TrainSignUpActivityStatisticsService;
import io.swagger.annotations.Api;
@@ -143,6 +140,14 @@ public class TrainSignUpActivityStatisticsController {
return Result.success(trainSignUpActivityStatisticsService.getTaleColumnInfo(courseId));
}
@At
@ApiOperation("获取时间信息")
@SaCheckPermission("trainSignUp.statistics")
public Result selectTimes(@Param("courseId") String courseId) {
List<TrainSignUpActivityCourse> activityCourses = dao.query(TrainSignUpActivityCourse.class, Cnd.where("courseId", "=", courseId).asc("courseStartTime"));
return Result.success(activityCourses);
}
/**
* 培训班上课签到信息
*
@@ -152,8 +157,10 @@ public class TrainSignUpActivityStatisticsController {
@At
@ApiOperation("获取签到信息")
@SaCheckPermission("trainSignUp.statistics")
public Result getSignInfo(@Param("courseId") String courseId) {
return Result.success(trainSignUpActivityStatisticsService.getSignInfo(courseId));
public Result getSignInfo(PageForm pageForm,
@Param("courseId") String courseId,
String timeId) {
return Result.success(trainSignUpActivityStatisticsService.getSignInfo(pageForm, courseId, timeId));
}
@At
@@ -165,6 +172,22 @@ public class TrainSignUpActivityStatisticsController {
return Result.success();
}
@At
@ApiOperation("设置签到")
@SaCheckPermission("trainSignUp.statistics")
public Result adjustSign(@Param("id") String id) {
TrainSignUpUserCourse userCourse = dao.fetch(TrainSignUpUserCourse.class, id);
if(userCourse.isAttend()) {
userCourse.setAttend(false);
userCourse.setAttendTime(null);
} else {
userCourse.setAttend(true);
userCourse.setAttendTime(userCourse.getCourseStartTime());
}
dao.update(userCourse);
return Result.success();
}
@At
@Ok("void")
@ApiOperation("导出签到名单")
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpCourse.java
+6 -1
View File
@@ -58,7 +58,12 @@ public class TrainSignUpCourse extends BaseModel implements Serializable {
@Comment("课程地点坐标")
private List<Double> courseLocationCoordinates;
@Column
@Column
@ColDefine(type = ColType.MYSQL_JSON)
@Comment("转换课程地点坐标")
private List<Double> transPosition;
@Column
@ColDefine(type = ColType.VARCHAR, width = 20)
@Comment("课程讲师")
private String courseInstructor;
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/TrainSignUpActivityStatisticsService.java
+1 -1
View File
@@ -49,7 +49,7 @@ public interface TrainSignUpActivityStatisticsService extends BaseService<TrainS
* @param courseId
* @return k->每个培训班每节课的上课时间 v->上课记录list
*/
Map<String, List<NutMap>> getSignInfo(String courseId);
Pagination getSignInfo(PageForm pageForm, String courseId, String timeId);
/**
* 报名人员list 导出
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java
+26 -36
View File
@@ -4,12 +4,10 @@ import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.zhgh.activity.family.models.FamilyType;
import com.budwk.app.zhgh.activity.family.models.FamilyUser;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainMobileSignColumn;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpCourse;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpType;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpUser;
import com.budwk.app.zhgh.activity.trainSignUp.models.*;
import com.budwk.app.zhgh.activity.trainSignUp.service.TrainSignUpActivityStatisticsService;
import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Cnd;
@@ -22,10 +20,7 @@ import org.nutz.json.Json;
import org.nutz.lang.Lang;
import org.nutz.lang.util.NutMap;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -103,14 +98,17 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
cnd.andEX("tsuu.courseId", "=", courseId);
sql.setCondition(cnd);
List<NutMap> list = listMap(sql);
list.forEach(o -> {
List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
if(Lang.isNotEmpty(mobileColumnsValue)) {
mobileColumnsValue.forEach(m -> {
o.put(m.getString("columnCode"), m.getString("columnValue"));
});
}
});
for (NutMap o : list) {
if(StrUtil.isBlank(o.getString("mobileColumnsValue"))) {
continue;
}
List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
if(Lang.isNotEmpty(mobileColumnsValue)) {
mobileColumnsValue.forEach(m -> {
o.put(m.getString("columnCode"), m.getString("columnValue"));
});
}
}
return list;
}
@@ -121,7 +119,7 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
dao().fetchLinks(upType, "trainMobileSignColumnList", Cnd.NEW().asc("columnIndex"));
List<TrainMobileSignColumn> columnList = upType.getTrainMobileSignColumnList();
List<NutMap> columnTableList = columnList.stream().map(o -> NutMap.NEW().setv("label", o.getColumnName()).setv("prop", o.getColumnCode())).collect(Collectors.toList());
List<NutMap> columnTableList = columnList.stream().filter(o -> StrUtil.isNotBlank(o.getColumnCode())).map(o -> NutMap.NEW().setv("label", o.getColumnName()).setv("prop", o.getColumnCode())).collect(Collectors.toList());
return columnTableList;
}
@@ -159,9 +157,10 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
}
@Override
public Map<String, List<NutMap>> getSignInfo(String courseId) {
Sql sql = Sqls.create("""
public Pagination getSignInfo(PageForm pageForm, String courseId, String timeId) {
Sql sql = Sqls.create("""
SELECT
tsuuc.id,
tsuuc.courseStartTime,
tsuuc.courseEndTime,
tsuuc.isAttend,
@@ -173,24 +172,15 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
FROM
`train_sign_up_user_course` tsuuc
LEFT JOIN `vw_user` u ON u.id = tsuuc.userId
WHERE
tsuuc.courseId = @courseId
$condition
""");
sql.setParam("courseId", courseId);
List<NutMap> list = listMap(sql);
Map<String, List<NutMap>> courseTimeMap = list.stream().map(v -> {
String courseTime = v.getString("courseStartTime") + " 至 " + v.getString("courseEndTime");
v.put("courseTime", courseTime);
return v;
}).collect(Collectors.groupingBy(v -> v.getString("courseTime")));
// 使用Stream API进行降序排序
Map<String, List<NutMap>> sortedDataMap = courseTimeMap.entrySet().stream()
.sorted(Map.Entry.comparingByKey(Comparator.reverseOrder()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
return sortedDataMap;
Cnd cnd = Cnd.NEW();
cnd.and("tsuuc.courseId", "=", courseId);
cnd.and("tsuuc.activityCourseId", "=", timeId);
cnd.desc("isAttend");
cnd.desc("attendTime");
sql.setCondition(cnd);
return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
}
@Override
src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java
+8 -1
View File
@@ -20,6 +20,8 @@ import com.budwk.app.web.commons.auth.utils.AuthUtil;
import com.budwk.app.web.controllers.open.commons.service.CommonService;
import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpActivity;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpUser;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpUserCourse;
import com.budwk.app.zhgh.club.model.ClubUser;
import com.budwk.app.zhgh.club.model.SysClub;
import com.budwk.app.zhgh.club.param.ClubUserPageForm;
@@ -28,6 +30,7 @@ import com.budwk.app.zhgh.club.service.SysClubUserService;
import com.budwk.app.zhgh.club.vo.ClubCommonPageVo;
import com.budwk.app.zhgh.club.vo.ClubUserImportVo;
import io.swagger.annotations.ApiOperation;
import org.apache.axis.utils.IDKey;
import org.apache.poi.ss.formula.functions.T;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Chain;
@@ -179,8 +182,12 @@ public class ClubInfoManageController {
dao.clear(ActivityUserScope.class, Cnd.where("userId", "=", clubUser.getUserId()).and("groupId", "in", groupList));
}
/* 根据品牌活动，操作user_scope表 end */
List<String> idList = activityList.stream().map(TrainSignUpActivity::getId).toList();
dao.clear(TrainSignUpUser.class, Cnd.where("activityId", "in", idList).and("userId", "=", clubUser.getUserId()));
dao.clear(TrainSignUpUserCourse.class, Cnd.where("activityId", "in", idList).and("userId", "=", clubUser.getUserId()));
sysUserService.clearCache();
sysUserService.clearCache();
sysRoleService.clearCache();
return Result.success();
}
src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java
+54 -1
View File
@@ -6,10 +6,11 @@ import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.sys.services.SysRoleService;
import com.budwk.app.sys.views.View_user;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.web.controllers.open.commons.service.CommonService;
import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope;
import com.budwk.app.zhgh.activity.trainSignUp.models.TrainSignUpActivity;
import com.budwk.app.zhgh.activity.trainSignUp.models.*;
import com.budwk.app.zhgh.club.model.ClubUser;
import com.budwk.app.zhgh.club.param.ClubUserPageForm;
import com.budwk.app.zhgh.club.service.SysClubService;
@@ -178,6 +179,58 @@ public class SysClubUserServiceImpl extends BaseServiceImpl<ClubUser> implements
}
}
dao().insert(addScopes);
// 报名
List<TrainSignUpUser> signList = new ArrayList<>();
List<TrainSignUpUserCourse> userCourseList = new ArrayList<>();
List<String> idList = activityList.stream().map(TrainSignUpActivity::getId).toList();
List<TrainSignUpCourse> courses = dao().query(TrainSignUpCourse.class, Cnd.where("activityId", "in", idList));
List<TrainSignUpActivityCourse> activityCourses = dao().query(TrainSignUpActivityCourse.class, Cnd.where("activityId", "in", idList));
List<View_user> userList = dao().query(View_user.class, Cnd.where("id", "in", users));
Map<String, View_user> userMap = userList.stream().collect(Collectors.toMap(View_user::getId, o -> o));
for (TrainSignUpCourse course : courses) {
for (String user : users) {
View_user u = userMap.get(user);
TrainSignUpUser signUpUser = new TrainSignUpUser();
signUpUser.setActivityId(course.getActivityId());
signUpUser.setCourseId(course.getId());
signUpUser.setUserId(user);
signUpUser.setMobile(u.getMobile());
signUpUser.setSignUpTime(new Date());
signUpUser.setState(1);
signUpUser.setUnionId(u.getUnionId());
signUpUser.setUnitId(u.getUnitId());
signUpUser.setUnionName(u.getUnionName());
signUpUser.setUnitName(u.getUnitName());
signList.add(signUpUser);
}
}
for (TrainSignUpActivityCourse ac : activityCourses) {
for (String user : users) {
View_user u = userMap.get(user);
TrainSignUpUserCourse aCourse = new TrainSignUpUserCourse();
aCourse.setActivityId(ac.getActivityId());
aCourse.setCourseId(ac.getCourseId());
aCourse.setUserId(user);
aCourse.setCourseStartTime(ac.getCourseStartTime());
aCourse.setCourseEndTime(ac.getCourseEndTime());
aCourse.setAttend(false);
aCourse.setAttendTime(null);
aCourse.setActivityCourseId(ac.getId());
userCourseList.add(aCourse);
}
}
if(Lang.isNotEmpty(signList)) {
dao().insert(signList);
}
if(Lang.isNotEmpty(userCourseList)) {
dao().insert(userCourseList);
}
}
}
}
src/main/java/com/budwk/app/zhgh/dayofficework/literacy/service/impl/LiteracyActivityStatisticsServiceImpl.java
+12 -9
View File
@@ -96,14 +96,17 @@ public class LiteracyActivityStatisticsServiceImpl extends BaseServiceImpl<Liter
cnd.andEX("tsuu.courseId", "=", courseId);
sql.setCondition(cnd);
List<NutMap> list = listMap(sql);
list.forEach(o -> {
List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
if(Lang.isNotEmpty(mobileColumnsValue)) {
mobileColumnsValue.forEach(m -> {
o.put(m.getString("columnCode"), m.getString("columnValue"));
});
}
});
for (NutMap o : list) {
if(StrUtil.isBlank(o.getString("mobileColumnsValue"))) {
continue;
}
List<NutMap> mobileColumnsValue = Json.fromJsonAsList(NutMap.class, o.getString("mobileColumnsValue"));
if(Lang.isNotEmpty(mobileColumnsValue)) {
mobileColumnsValue.forEach(m -> {
o.put(m.getString("columnCode"), m.getString("columnValue"));
});
}
}
return list;
}
@@ -180,7 +183,7 @@ public class LiteracyActivityStatisticsServiceImpl extends BaseServiceImpl<Liter
// 使用Stream API进行降序排序
Map<String, List<NutMap>> sortedDataMap = courseTimeMap.entrySet().stream()
.sorted(Map.Entry.comparingByKey(Comparator.reverseOrder()))
.sorted(Map.Entry.comparingByKey(Comparator.naturalOrder()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
return sortedDataMap;