From 1bce00f5b3614ca12b683dfe8a3cf733e1ed68b6 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期五, 26 五月 2023 16:25:22 +0800
Subject: [PATCH] 11
---
src/main/java/com/qxueyou/scc/school/service/impl/SignService.java | 236 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 118 insertions(+), 118 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/school/service/impl/SignService.java b/src/main/java/com/qxueyou/scc/school/service/impl/SignService.java
index 32d8787..359089b 100644
--- a/src/main/java/com/qxueyou/scc/school/service/impl/SignService.java
+++ b/src/main/java/com/qxueyou/scc/school/service/impl/SignService.java
@@ -57,15 +57,15 @@
@Service
public class SignService extends CommonAppService implements ISignService {
- private static final String late = "迟到";
+ private static final String late = "杩熷埌";
- private static final String normal = "正常";
+ private static final String normal = "姝ｅ父";
private static Logger log = LogManager.getLogger("SignService");
private SignDAO signDAO;
-// // 签到上大屏
+// // 绛惧埌涓婂ぇ灞�
// @Autowired
// IMsgVenderService easemobService;
//
@@ -75,7 +75,7 @@
// @Autowired
// ICacheService cacheService;
-// /** 微信业务操作 **/
+// /** 寰俊涓氬姟鎿嶄綔 **/
// @Autowired
// IWeixinCommonService weixinCommonService;
@@ -92,7 +92,7 @@
}
/**
- * 依赖注入
+ * 渚濊禆娉ㄥ叆
*
* @param interactDAO
*/
@@ -109,7 +109,7 @@
List<SchSign> lstSchSign = this.find("select s from SchSign s where s.classScheduleId = ? and s.deleteFlag is false and signId <> ?",
CollectionUtils.newList(sign.getClassScheduleId(), signId), SchSign.class);
if(lstSchSign != null && !lstSchSign.isEmpty()){
- return new Result(false, "你选择的课程已经存在签到，请不要重复添加");
+ return new Result(false, "浣犻�夋嫨鐨勮绋嬪凡缁忓瓨鍦ㄧ鍒帮紝璇蜂笉瑕侀噸澶嶆坊鍔�");
}
SchSign objSchSign = this.read(SchSign.class, signId);
objSchSign.setUpdateId(ClientUtils.getUserId());
@@ -133,10 +133,10 @@
List<SchSign> lstSchSign = this.find("select s from SchSign s where s.classScheduleId = ? and s.deleteFlag is false",
CollectionUtils.newList(sign.getClassScheduleId()), SchSign.class);
if(lstSchSign != null && !lstSchSign.isEmpty()){
- return new Result(false, "你选择的课程已经存在签到，请不要重复添加");
+ return new Result(false, "浣犻�夋嫨鐨勮绋嬪凡缁忓瓨鍦ㄧ鍒帮紝璇蜂笉瑕侀噸澶嶆坊鍔�");
}
- // 获取客户端信息
- // 设置基本字段
+ // 鑾峰彇瀹㈡埛绔俊鎭�
+ // 璁剧疆鍩烘湰瀛楁
String signCode = generateSignCode(ClientUtils.getClassId());
sign.setCreateId(ClientUtils.getUserId());
sign.setCreateTime(new Date(System.currentTimeMillis()));
@@ -160,7 +160,7 @@
// sign.setNoticeUserId(msgUser.getUserId());
// sign.setNoticePassword(RSAUtils.encrypt(uuidPwd));
// }
- //添加签到码
+ //娣诲姞绛惧埌鐮�
SchSignCode signCodeVO = new SchSignCode();
signCodeVO.setCode(signCode);
signCodeVO.setClassId(ClientUtils.getClassId());
@@ -179,8 +179,8 @@
}
/**
- * 生成签到码
- * @param classId 班级ID
+ * 鐢熸垚绛惧埌鐮�
+ * @param classId 鐝骇ID
* @return
*/
private String generateSignCode(String classId){
@@ -203,14 +203,14 @@
SchSignItem signItem = new SchSignItem();
- // 获取当前用户
+ // 鑾峰彇褰撳墠鐢ㄦ埛
signItem.setSignId(sign.getSignId());
signItem.setDeleteFlag(false);
signItem.setSignAddress(signAddress);
signItem.setSignTime(signTime);
signItem.setUserId(userId);
signItem.setUserName(userName);
- // 公用配置
+ // 鍏敤閰嶇疆
TraceUtils.setCreateTrace(signItem);
this.save(signItem);
@@ -220,15 +220,15 @@
@Override
/**
- * 签到
+ * 绛惧埌
*/
public int insertSignOrder(SchSign signVO, Date signTime) {
String hql = "from SchSignOrder where deleteFlag is false and signId=? ";
- // 该堂课已经签到多少位
+ // 璇ュ爞璇惧凡缁忕鍒板灏戜綅
int signCount = this.findCount(hql,
CollectionUtils.newList(signVO.getSignId()));
- // 签到+1
+ // 绛惧埌+1
signCount++;
SchSignOrder signOrder = new SchSignOrder();
@@ -239,17 +239,17 @@
signOrder.setSignOrder(signCount);
signOrder.setSignTime(signTime);
- // 公用配置
+ // 鍏敤閰嶇疆
TraceUtils.setCreateTrace(signOrder);
- // 保存到db
+ // 淇濆瓨鍒癲b
this.save(signOrder);
return signCount;
}
/**
- * 得到签到明细
+ * 寰楀埌绛惧埌鏄庣粏
* @param signId
* @return
*/
@@ -276,14 +276,14 @@
"ORDER BY TS.START_TIME IS NULL , TS.START_TIME ASC ";
listResult = signDAO.querySignItemList(strSQL, CollectionUtils.newList(classId,signId,signId));
}else{
- log.error("查询签到明细失败，参数不正确：cls=".concat(ClientUtils.getClassId()).concat(";signId=").concat(signId));
+ log.error("鏌ヨ绛惧埌鏄庣粏澶辫触锛屽弬鏁颁笉姝ｇ‘锛歝ls=".concat(ClientUtils.getClassId()).concat(";signId=").concat(signId));
}
return listResult;
}
/**
- * 有一个时分秒的问题：只需要检测到分钟：9：00是标准时间 9：00：59 仍然是正常
+ * 鏈変竴涓椂鍒嗙鐨勯棶棰橈細鍙渶瑕佹娴嬪埌鍒嗛挓锛�9锛�00鏄爣鍑嗘椂闂� 9锛�00锛�59 浠嶇劧鏄甯�
* @param realTime
* @param standardTime
* @return
@@ -299,7 +299,7 @@
}
/**
- * 有一个时分秒的问题：只需要检测到分钟：
+ * 鏈変竴涓椂鍒嗙鐨勯棶棰橈細鍙渶瑕佹娴嬪埌鍒嗛挓锛�
* @param realTime
* @param standardTime
* @return
@@ -309,18 +309,18 @@
if(null != realTime && null != standardTime){
Date real = DateUtils.truncate(realTime, Calendar.MINUTE);
Date standard = DateUtils.truncate(standardTime, Calendar.MINUTE);
- status = real.compareTo(standard) == -1 ? "早退" :normal;
+ status = real.compareTo(standard) == -1 ? "鏃╅��" :normal;
}
return status;
}
/**
- * 插入签到统计信息
+ * 鎻掑叆绛惧埌缁熻淇℃伅
*/
public SignStatisResult insertSignStatistics(SchSign sign, String signAddress,
Date signTime,Short terminalType,String userId,String userName,String mobilePhone, String location) {
User user = this.read(User.class, userId);
- //判断签到类型,1:仅上课签到；2：上下课都需签到
+ //鍒ゆ柇绛惧埌绫诲瀷,1:浠呬笂璇剧鍒帮紱2锛氫笂涓嬭閮介渶绛惧埌
SignStatisResult result = new SignStatisResult();
short signType = sign.getSignType();
if(SchSign.SIGN_TYPE_FIRST == signType){
@@ -337,7 +337,7 @@
}
/**
- * 查询签到当天的课次
+ * 鏌ヨ绛惧埌褰撳ぉ鐨勮娆�
*
* @param signId
* @return
@@ -349,7 +349,7 @@
}
/**
- * 插入签到
+ * 鎻掑叆绛惧埌
*
* @param signVO
* @param signAddress
@@ -359,16 +359,16 @@
* @return
*/
public SignStatisResult insertSignStatistics(SchSign signVO, String signAddress, String userId, String userName, String mobilePhone, short type){
- // 签到时间
+ // 绛惧埌鏃堕棿
Date signTime= new Date(System.currentTimeMillis());
String strAddress = this.getAddress(signAddress);
- //3. 插入签到统计
+ //3. 鎻掑叆绛惧埌缁熻
SignStatisResult result = this.insertSignStatistics(signVO, strAddress, signTime,type ,userId,userName,mobilePhone, signAddress);
if(!result.getResult()){
return new SignStatisResult(false,result.getErrMsg());
}
- // 2.插入签到历史记录
+ // 2.鎻掑叆绛惧埌鍘嗗彶璁板綍
this.insertSignItem(signVO, signAddress, signTime,ClientUtils.getUserId(),ClientUtils.getUserName());
List<SchSignStatistics> schSignStatisticss = this.queryPageLstSignStatistics(result.getSignStatistics(), null, result.getSignType(), signVO.getSignId());
@@ -377,12 +377,12 @@
obj.setSignType(result.getSignType());
}
- //查询班主任名字
+ //鏌ヨ鐝富浠诲悕瀛�
ClsClass objOrgClass = this.read(ClsClass.class, signVO.getClassId());
result.setSignAddr(strAddress);
result.setSignStatisticss(schSignStatisticss);
- //2015-08-10增加返回是否班级成员
+ //2015-08-10澧炲姞杩斿洖鏄惁鐝骇鎴愬憳
result.setRegFlag(this.queryRegistrationFlag(ClientUtils.getUserId(), signVO.getClassId()));
result.setClassCharger(objOrgClass.getClassCharger());
@@ -390,7 +390,7 @@
}
/**
- * 根据经纬度获取地址
+ * 鏍规嵁缁忕含搴﹁幏鍙栧湴鍧�
* @param location
* @return
*/
@@ -424,7 +424,7 @@
}
/**
- * 活动签到，插入签到统计信息（上课，只有第一次插入记录）
+ * 娲诲姩绛惧埌锛屾彃鍏ョ鍒扮粺璁′俊鎭紙涓婅锛屽彧鏈夌涓�娆℃彃鍏ヨ褰曪級
* @param sign
* @param signAddress
* @param signTime
@@ -435,12 +435,12 @@
int signOrder = 0;
SignStatisResult result = new SignStatisResult();
- //1.查询是否已签到,查询当天签到情况
- //获取当天用户是否签到
- //1.查询是否已签到,查询当天签到情况
+ //1.鏌ヨ鏄惁宸茬鍒�,鏌ヨ褰撳ぉ绛惧埌鎯呭喌
+ //鑾峰彇褰撳ぉ鐢ㄦ埛鏄惁绛惧埌
+ //1.鏌ヨ鏄惁宸茬鍒�,鏌ヨ褰撳ぉ绛惧埌鎯呭喌
String hql = "from SchSignStatistics where deleteFlag is false and signId = ? and userId = ?";
SchSignStatistics objSchSignStatistics = findUnique(hql,CollectionUtils.newList(sign.getSignId(), userId),SchSignStatistics.class);
- //第一次保存，以后不更新，已最早时间为准（每次更新最新签到地址）
+ //绗竴娆′繚瀛橈紝浠ュ悗涓嶆洿鏂帮紝宸叉渶鏃╂椂闂翠负鍑嗭紙姣忔鏇存柊鏈�鏂扮鍒板湴鍧�锛�
if(null != objSchSignStatistics){
signOrder = objSchSignStatistics.getFirstSignOrder();
objSchSignStatistics.setTerminalType(terminalType);
@@ -449,7 +449,7 @@
save(objSchSignStatistics);
result.setSignStatistics(objSchSignStatistics);
}else{
- // 已经签到个数
+ // 宸茬粡绛惧埌涓暟
String hql1 = "from SchSignStatistics where deleteFlag is false and signId = ?";
int signCount = findCount(hql1,CollectionUtils.newList(sign.getSignId()));
signOrder = signCount + 1;
@@ -473,7 +473,7 @@
obj.setMobilePhone(mobilePhone);
obj.setInstallFlag(queryInstallFlag(userId));
obj.setRegisteFlag(queryRegistrationFlag(userId,sign.getClassId()));
- //第一次保存
+ //绗竴娆′繚瀛�
save(obj);
result.setSignStatistics(obj);
}
@@ -485,7 +485,7 @@
}
/**
- * 是否超过签到限制距离
+ * 鏄惁瓒呰繃绛惧埌闄愬埗璺濈
*
* @param signVO
* @param signAddress
@@ -498,14 +498,14 @@
return new Result(true);
}
if(StringUtils.isBlank(signAddress)){
- return new Result(false, "签到失败，未获取到签到地址，请确认是否开启定位");
+ return new Result(false, "绛惧埌澶辫触锛屾湭鑾峰彇鍒扮鍒板湴鍧�锛岃纭鏄惁寮�鍚畾浣�");
}
SchScheduleAddress objSchScheduleAddress = this.read(SchScheduleAddress.class, objSchClassSchedule.getAddressId());
if(objSchScheduleAddress == null){
- return new Result(false, "签到失败，课程签到地址设置错误，请联系班主任修正签到地址");
+ return new Result(false, "绛惧埌澶辫触锛岃绋嬬鍒板湴鍧�璁剧疆閿欒锛岃鑱旂郴鐝富浠讳慨姝ｇ鍒板湴鍧�");
}
if(StringUtils.isBlank(objSchScheduleAddress.getLatitudeY()) || StringUtils.isBlank(objSchScheduleAddress.getLongitudeX())){
- return new Result(false, "签到失败，课程签到地址设置错误，请联系班主任修正签到地址");
+ return new Result(false, "绛惧埌澶辫触锛岃绋嬬鍒板湴鍧�璁剧疆閿欒锛岃鑱旂郴鐝富浠讳慨姝ｇ鍒板湴鍧�");
}
String[] signAddresss = signAddress.split(",");
@@ -519,17 +519,17 @@
objSchSignStatistics.setStatisticsFlag(SchSignStatistics.STATISTICS_FLAG_NO);
}
objSchSignStatistics.setOutOfRange(range*1000);
- return new Result(true, b?"":"签到成功，由于您的签到地址超出上课地址的签到范围，因此你的签到无法记录本班当日已出勤人数，请与班主任联系");
+ return new Result(true, b?"":"绛惧埌鎴愬姛锛岀敱浜庢偍鐨勭鍒板湴鍧�瓒呭嚭涓婅鍦板潃鐨勭鍒拌寖鍥达紝鍥犳浣犵殑绛惧埌鏃犳硶璁板綍鏈彮褰撴棩宸插嚭鍕や汉鏁帮紝璇蜂笌鐝富浠昏仈绯�");
}
/**
- * 获取当天签到地址
+ * 鑾峰彇褰撳ぉ绛惧埌鍦板潃
*
* @param signId
* @return
*/
public SchScheduleAddress getSchScheduleAddress(String signId){
- //获取签到码当天签到的课程
+ //鑾峰彇绛惧埌鐮佸綋澶╃鍒扮殑璇剧▼
SchClassSchedule objSchClassSchedule = this.getSchClassSchedule(signId);
if(objSchClassSchedule == null){
return new SchScheduleAddress();
@@ -540,7 +540,7 @@
}
/**
- * 上课签到，插入签到统计信息（上课，只有第一次插入记录）
+ * 涓婅绛惧埌锛屾彃鍏ョ鍒扮粺璁′俊鎭紙涓婅锛屽彧鏈夌涓�娆℃彃鍏ヨ褰曪級
* @param sign
* @param signAddress
* @param signTime
@@ -555,19 +555,19 @@
SignStatisResult result = new SignStatisResult();
result.setSignType(SignStatisResult.SIGN_TYPE_FIRST);
- //1.查询是否已签到,查询当天签到情况
- //获取当天用户是否签到
+ //1.鏌ヨ鏄惁宸茬鍒�,鏌ヨ褰撳ぉ绛惧埌鎯呭喌
+ //鑾峰彇褰撳ぉ鐢ㄦ埛鏄惁绛惧埌
SchSignStatistics objSchSignStatistics = this.getSchSignStatistics(sign.getSignId(), userId);
- //获取签到码当天签到的课程
+ //鑾峰彇绛惧埌鐮佸綋澶╃鍒扮殑璇剧▼
SchClassSchedule objSchClassSchedule = this.getSchClassSchedule(sign.getSignId());
boolean activeFlag = queryActiveflag(userId,sign.getClassId());
if(sign.getRegisterAllow() == 1 && !activeFlag){
- result.setErrMsg("签到失败，您还未加入该班级");
+ result.setErrMsg("绛惧埌澶辫触锛屾偍杩樻湭鍔犲叆璇ョ彮绾�");
result.setResult(false);
return result;
}
if(objSchClassSchedule == null){
- result.setErrMsg("签到失败，今天该课程未开课");
+ result.setErrMsg("绛惧埌澶辫触锛屼粖澶╄璇剧▼鏈紑璇�");
result.setResult(false);
return result;
}
@@ -576,15 +576,15 @@
int signCount = 0;
if(lstSchSignStatistics == null){
String hql1 = "from SchSignStatistics where deleteFlag is false and signId = ? and date(signDate) = date(now())";
- // 已经签到个数
+ // 宸茬粡绛惧埌涓暟
signCount = findCount(hql1,CollectionUtils.newList(sign.getSignId()));
}else{
signCount = lstSchSignStatistics.size();
}
- //第一次保存，以后不更新，已最早时间为准（每次更新最新签到地址）
+ //绗竴娆′繚瀛橈紝浠ュ悗涓嶆洿鏂帮紝宸叉渶鏃╂椂闂翠负鍑嗭紙姣忔鏇存柊鏈�鏂扮鍒板湴鍧�锛�
if(null == objSchSignStatistics){
- //查询课程信息
+ //鏌ヨ璇剧▼淇℃伅
SchClassSubject objSchClassSubject = this.getCommonDAO().read(SchClassSubject.class, sign.getClassScheduleId());
signOrder = signCount + 1;
objSchSignStatistics = new SchSignStatistics();
@@ -610,7 +610,7 @@
objSchSignStatistics.setMobilePhone(mobilePhone);
objSchSignStatistics.setInstallFlag(queryInstallFlag(userId));
objSchSignStatistics.setRegisteFlag(activeFlag);
- //第一次保存
+ //绗竴娆′繚瀛�
}
Result isOutofRange = this.isOutofRange(sign, location, objSchClassSchedule, activeFlag, objSchSignStatistics);
if(!isOutofRange.isSuccess()){
@@ -650,21 +650,21 @@
}
/**
- * 获取当天是否已经签到
+ * 鑾峰彇褰撳ぉ鏄惁宸茬粡绛惧埌
*
* @param signId
* @return
*/
public SchSignStatistics getSchSignStatistics(String signId, String userId){
- //1.查询是否已签到,查询当天签到情况
+ //1.鏌ヨ鏄惁宸茬鍒�,鏌ヨ褰撳ぉ绛惧埌鎯呭喌
String hql = "from SchSignStatistics where deleteFlag is false and signId = ? and userId = ? and date(signDate) = date(now())";
return findUnique(hql,CollectionUtils.newList(signId, userId),SchSignStatistics.class);
}
/**
- * 上下课都需签到时，插入签到统计信息
- * 上课签到：调用insertSignFirst()
- * 下课签到：每次更新，按下课签到时间倒序排列
+ * 涓婁笅璇鹃兘闇�绛惧埌鏃讹紝鎻掑叆绛惧埌缁熻淇℃伅
+ * 涓婅绛惧埌锛氳皟鐢╥nsertSignFirst()
+ * 涓嬭绛惧埌锛氭瘡娆℃洿鏂帮紝鎸変笅璇剧鍒版椂闂村�掑簭鎺掑垪
* @param sign
* @param signAddress
* @param signTime
@@ -675,18 +675,18 @@
Date signTime,Short terminalType,String userId,String userName,String mobilePhone, String location){
SignStatisResult result = new SignStatisResult();
- //1.判断当前签到是上课,else:下课签到
- //精确到分钟比较
- //获取签到码当天签到的课程
+ //1.鍒ゆ柇褰撳墠绛惧埌鏄笂璇�,else:涓嬭绛惧埌
+ //绮剧‘鍒板垎閽熸瘮杈�
+ //鑾峰彇绛惧埌鐮佸綋澶╃鍒扮殑璇剧▼
SchClassSchedule objSchClassSchedule = this.getSchClassSchedule(sign.getSignId());
if(objSchClassSchedule == null){
- result.setErrMsg("今天该课程未开课，不需要签到");
+ result.setErrMsg("浠婂ぉ璇ヨ绋嬫湭寮�璇撅紝涓嶉渶瑕佺鍒�");
result.setResult(false);
return result;
}
boolean activeFlag = queryActiveflag(userId,sign.getClassId());
if(sign.getRegisterAllow() == 1 && !activeFlag){
- result.setErrMsg("签到失败，您还未加入该班级");
+ result.setErrMsg("绛惧埌澶辫触锛屾偍杩樻湭鍔犲叆璇ョ彮绾�");
result.setResult(false);
return result;
}
@@ -695,7 +695,7 @@
Date signDate = DateUtils.truncate(signTime, Calendar.MINUTE);
if((endDate.getTime() + startDate.getTime())/2 >= signDate.getTime()){
result.setSignType(SignStatisResult.SIGN_TYPE_FIRST);
- //插入上课签到信息
+ //鎻掑叆涓婅绛惧埌淇℃伅
result = insertSignFirst(sign,signAddress,signTime,terminalType,userId,userName,mobilePhone, location);
}else{
result.setSignType(SignStatisResult.SIGN_TYPE_LAST);
@@ -707,7 +707,7 @@
}else{
obj.setLastSignStatus(SchSignStatistics.SIGN_STATUS_EARLY);
}
- //每次更新
+ //姣忔鏇存柊
obj.setUserName(userName);
obj.setInstallFlag(queryInstallFlag(userId));
obj.setRegisteFlag(activeFlag);
@@ -726,9 +726,9 @@
result.setRange(obj.getOutOfRange());
result.setErrMsg(isOutofRange.getMsg());
}else{
- //查询课程信息
+ //鏌ヨ璇剧▼淇℃伅
SchClassSubject objSchClassSubject = this.getCommonDAO().read(SchClassSubject.class, sign.getClassScheduleId());
- //否则第一次下课签到
+ //鍚﹀垯绗竴娆′笅璇剧鍒�
SchSignStatistics objNew = new SchSignStatistics();
TraceUtils.setCreateTrace(objNew);
objNew.setSignId(sign.getSignId());
@@ -758,7 +758,7 @@
result.setResult(false);
return result;
}
- //第一次保存
+ //绗竴娆′繚瀛�
save(objNew);
result.setSignStatistics(objNew);
result.setRange(objNew.getOutOfRange());
@@ -770,7 +770,7 @@
}
/**
- * 查询是否安装（通过账号登录记录）
+ * 鏌ヨ鏄惁瀹夎锛堥�氳繃璐﹀彿鐧诲綍璁板綍锛�
*/
public boolean queryInstallFlag(String userId){
String hql = "from UserOperate where deleteFlag is false and userId= ? ";
@@ -779,7 +779,7 @@
}
/**
- * 查询是否班级成员（通过账号登录记录）
+ * 鏌ヨ鏄惁鐝骇鎴愬憳锛堥�氳繃璐﹀彿鐧诲綍璁板綍锛�
*/
public boolean queryRegistrationFlag(String userId,String classId){
String hql = "from UserRegistration where deleteFlag is false and userId= ? and classId = ? ";
@@ -788,7 +788,7 @@
}
/**
- * 查询是否班级激活
+ * 鏌ヨ鏄惁鐝骇婵�娲�
*/
public boolean queryActiveflag(String userId,String classId){
String hql = "from UserRegistration where deleteFlag is false and userId= ? and classId = ? and status = ?";
@@ -797,7 +797,7 @@
}
/**
- * 得到满足要求的签到明细(优化版本)
+ * 寰楀埌婊¤冻瑕佹眰鐨勭鍒版槑缁�(浼樺寲鐗堟湰)
* @param signId
* @return
*/
@@ -806,7 +806,7 @@
}
/**
- * 查询
+ * 鏌ヨ
*
* @param signId
* @param signDate
@@ -823,7 +823,7 @@
List<SchSignStatistics> lstStatistics = this.signDAO.querySchSignStatisticses(hql, CollectionUtils.newList(signId, 2));
- //查询，SQL会清晰
+ //鏌ヨ锛孲QL浼氭竻鏅�
String hql0 = " select r.USER_ID as userId,r.user_name as userName,r.mobile_phone as mobilePhone ,case when o.user_id is not null then 1 else 0 end installFlag,u.attribute1 as companyName from user_registration r "
+ " left join "
+ " user_operate o "
@@ -843,14 +843,14 @@
}
/**
- * 导出(优化版本)
+ * 瀵煎嚭(浼樺寲鐗堟湰)
* @param signId
* @param objSchSign
* @return
*/
public List<ExportSchSignItem> exportSimpleItems(String signId, String signDate){
- //查询列表的数据
+ //鏌ヨ鍒楄〃鐨勬暟鎹�
List<SchSignStatistics> lstStatistics = getHandleStatistics(signId, signDate);
List<ExportSchSignItem> lstExports = new ArrayList<ExportSchSignItem>();
@@ -888,13 +888,13 @@
value = late;
break;
case SchSignStatistics.SIGN_STATUS_EARLY :
- value = "早退";
+ value = "鏃╅��";
break;
case SchSignStatistics.SIGN_STATUS_NO :
- value = "未签到";
+ value = "鏈鍒�";
break;
default:
- value = "签到异常";
+ value = "绛惧埌寮傚父";
break;
}
@@ -926,7 +926,7 @@
}
/**
- * 签到历史
+ * 绛惧埌鍘嗗彶
* @return
*/
@Override
@@ -936,7 +936,7 @@
}
/**
- * 微信签到高级设置
+ * 寰俊绛惧埌楂樼骇璁剧疆
* @param sign
* @return
*/
@@ -968,13 +968,13 @@
if(null!=sign.getOrgShow()){
objSign.setOrgShow(sign.getOrgShow());
}
- // 获取客户端信息
+ // 鑾峰彇瀹㈡埛绔俊鎭�
objSign.setUpdateId(ClientUtils.getUserId());
objSign.setUpdateTime(new Date(System.currentTimeMillis()));
objSign.setUpdator(ClientUtils.getUserName());
save(objSign);
- //更新缓存
+ //鏇存柊缂撳瓨
// cacheService.set(CacheConstants.SCH_SIGN_ID_PREFIX.concat(objSign.getSignId()), CacheConstants.SCH_SIGN_ID_TIME, objSign);
return new Result(true);
@@ -982,7 +982,7 @@
/**
- * 签到 发送消息,环信替代
+ * 绛惧埌 鍙戦�佹秷鎭�,鐜俊鏇夸唬
* @param signType
* @param signIndex
* @param signId
@@ -994,7 +994,7 @@
SchSign schSign = this.getSignFromCacheOrDB(signId);
Map<String,String> extra = new HashMap<String,String>();
- extra.put("title", "签到");
+ extra.put("title", "绛惧埌");
extra.put("userId", user.getUserId());
extra.put("userName", user.getName());
extra.put("userImg", user.getImgPath());
@@ -1002,13 +1002,13 @@
extra.put("signIndex", String.valueOf(signIndex));
extra.put("signId", signId);
-// easemobService.doSendTextMsgToUsers("notice-sys", new String[]{schSign.getNoticeUserId()}, "用户签到", extra);
+// easemobService.doSendTextMsgToUsers("notice-sys", new String[]{schSign.getNoticeUserId()}, "鐢ㄦ埛绛惧埌", extra);
return new Result(true) ;
}
/**
- * 初始化签到信息
+ * 鍒濆鍖栫鍒颁俊鎭�
* @param signId
* @param userId
* @param initType
@@ -1057,7 +1057,7 @@
}
/**
- * 根据课程信息获取签到信息
+ * 鏍规嵁璇剧▼淇℃伅鑾峰彇绛惧埌淇℃伅
*
* @param strClassSubjectId
* @return
@@ -1068,7 +1068,7 @@
}
/**
- * 根据课程信息获取签到人员记录
+ * 鏍规嵁璇剧▼淇℃伅鑾峰彇绛惧埌浜哄憳璁板綍
*
* @param strClassSubjectId
* @return
@@ -1082,7 +1082,7 @@
/**
- * 查询签到历史
+ * 鏌ヨ绛惧埌鍘嗗彶
* @param hql
* @param args
* @param page
@@ -1103,11 +1103,11 @@
return lstSchSignStatistics;
}
StringBuffer sb = new StringBuffer(512);
- // 4.查询签到名次
+ // 4.鏌ヨ绛惧埌鍚嶆
sb.append("select s, u.imgPath from SchSignStatistics s, User u where ");
sb.append(" s.userId=u.userId and s.deleteFlag is false and s.signId = ? ");
- //根据类型判断排序规则
+ //鏍规嵁绫诲瀷鍒ゆ柇鎺掑簭瑙勫垯
if(signType == null || SchSign.SIGN_TYPE_ALL == signType){
sb.append(" and date(s.signDate) = date(NOW()) and s.lastSignTime is not null order by s.lastSignTime desc ");
}else if(SchSign.SIGN_TYPE_FIRST == signType){
@@ -1124,7 +1124,7 @@
currPage.setPageSize(200);
}
- // 查询并且缓存
+ // 鏌ヨ骞朵笖缂撳瓨
List<SchSignStatistics> lstData = this.querySignItemListStat(sb.toString(), CollectionUtils.newList(signId));
// cacheService.set(cache, CacheConstants.BUSINESS_DATA_TIME, lstData);
@@ -1133,7 +1133,7 @@
}
/**
- * 签到，根据signId得到schSign
+ * 绛惧埌锛屾牴鎹畇ignId寰楀埌schSign
* @param signId
* @return
*/
@@ -1157,7 +1157,7 @@
}
/**
- * 签到对应活动，根据signId得到相对应的活动
+ * 绛惧埌瀵瑰簲娲诲姩锛屾牴鎹畇ignId寰楀埌鐩稿搴旂殑娲诲姩
* @param signId
* @return
*/
@@ -1181,7 +1181,7 @@
// }
/**
- * 根据sign得到相对应的机构图像
+ * 鏍规嵁sign寰楀埌鐩稿搴旂殑鏈烘瀯鍥惧儚
* @param signId
* @return
*/
@@ -1207,7 +1207,7 @@
public Result sendSignQueueMsg(String args){
- // 延时一分钟发送
+ // 寤舵椂涓�鍒嗛挓鍙戦��
// ONSMsg msg = new ONSMsg(onsProducer.getTopic());
// msg.put("msgType", "SCH_SIGN_QUEUE");
@@ -1227,9 +1227,9 @@
}
/**
- * 签到异步处理部分代码
+ * 绛惧埌寮傛澶勭悊閮ㄥ垎浠ｇ爜
*
- * @param strArgs json对象
+ * @param strArgs json瀵硅薄
* @return
*/
@SuppressWarnings("unused")
@@ -1251,7 +1251,7 @@
// if(StringUtils.isNotBlank(inputCode) && StringUtils.isNotBlank(openId)){
//
-// // 查询并更新绑定关系
+// // 鏌ヨ骞舵洿鏂扮粦瀹氬叧绯�
// UserReWeixin weixin = weixinCommonService.queryUserReWxByOpenId(openId);
// if(weixin == null){
// weixinCommonService.saveUserReWeixin(openId, userId, source);
@@ -1260,10 +1260,10 @@
// }
// }
- //签到积分
+ //绛惧埌绉垎
// scoreChangeService.doSign(userId, signId);
- //签到大屏,发送消息
+ //绛惧埌澶у睆,鍙戦�佹秷鎭�
User user = new User();
user.setName(userName);
user.setUserId(userId);
@@ -1276,16 +1276,16 @@
}
/**
- * 通过openId得到user
+ * 閫氳繃openId寰楀埌user
* @param openId
* @return
*/
public User getUserFromOpenId(String openId){
User user = null;
-// // 通过openId找user
+// // 閫氳繃openId鎵緐ser
// if(StringUtils.isNotBlank(openId)){
//
-// // 查询绑定关系
+// // 鏌ヨ缁戝畾鍏崇郴
// UserReWeixin weixin = weixinCommonService.queryUserReWxByOpenId(openId);
// if (null != weixin) {
// user = read(User.class, weixin.getUserId());
@@ -1311,17 +1311,17 @@
.concat(String.valueOf(currPage.getPageSize()));
// if(SignStatisResult.SIGN_TYPE_FIRST == signType){
-// // 如果满一页取缓存
+// // 濡傛灉婊′竴椤靛彇缂撳瓨
// Object obj = cacheService.get(cacheKey, Object.class);
// if(null != obj ){
// return (List<SchSignStatistics>)obj;
// }
// }
- // 查询并且缓存
+ // 鏌ヨ骞朵笖缂撳瓨
List<SchSignStatistics> lstData = signDAO.querySignItemListCom(hql, currPage, args);
- // 满一页数据缓存
+ // 婊′竴椤垫暟鎹紦瀛�
// if(lstData.size() == currPage.getPageSize() ){
// cacheService.set(cacheKey, CacheConstants.SCH_SIGN_STATISTICS_FIRST_ACTPAGE_TIME, lstData);
// }
@@ -1331,7 +1331,7 @@
}
/**
- * 未签到统计页面
+ * 鏈鍒扮粺璁￠〉闈�
*
* @param signId
* @param signDate
@@ -1339,7 +1339,7 @@
*/
public Result updateFlag(String signStatisticsIds){
if(StringUtils.isBlank(signStatisticsIds)){
- return new Result(false, "参数错误");
+ return new Result(false, "鍙傛暟閿欒");
}
this.bulkUpdateInLoop("update SchSignStatistics s set s.statisticsFlag = 1 where s.signStatisticsId = ?", signStatisticsIds.split(","));
@@ -1364,7 +1364,7 @@
}
/**
- * 班级听课证签到
+ * 鐝骇鍚璇佺鍒�
*
* @param signVO
* @param userId
@@ -1373,11 +1373,11 @@
*/
public SignStatisResult doSignByClassCard(SchSign signVO, String userId){
User user = this.read(User.class, userId);
- //设置默认不控制距离和只能本班签到
+ //璁剧疆榛樿涓嶆帶鍒惰窛绂诲拰鍙兘鏈彮绛惧埌
signVO.setRegisterAllow(SchSign.SIGN_ACT_DISALLOW);
signVO.setOutRangeAllow(SchSign.SIGN_ACT_ALLOW);
- //3. 插入签到统计
+ //3. 鎻掑叆绛惧埌缁熻
SignStatisResult result = this.insertSignStatistics(signVO, null, new Date(),
SchSignStatistics.TERMINAL_TYPE_WECHAT, userId, user.getName(), user.getMobilePhone(), null);
if(!result.getResult()){
--
Gitblit v1.8.0