From cc70ac05f3fcca3b85f7860e7404bb2bfc4429a6 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期一, 29 五月 2023 14:12:10 +0800
Subject: [PATCH] 判断旧密码
---
src/main/java/com/qxueyou/scc/courseware/service/impl/CourceCategoryAppService.java | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/courseware/service/impl/CourceCategoryAppService.java b/src/main/java/com/qxueyou/scc/courseware/service/impl/CourceCategoryAppService.java
index c754ce0..033e75c 100644
--- a/src/main/java/com/qxueyou/scc/courseware/service/impl/CourceCategoryAppService.java
+++ b/src/main/java/com/qxueyou/scc/courseware/service/impl/CourceCategoryAppService.java
@@ -39,7 +39,7 @@
private OrgDAO orgDAO;
/**
- * IHandoutService服务
+ * IHandoutService鏈嶅姟
*/
@Autowired
IHandoutService handoutService;
@@ -52,7 +52,7 @@
}
/**
- * 依赖注入
+ * 渚濊禆娉ㄥ叆
*
* @param commonDAO
*/
@@ -79,7 +79,7 @@
}
/**
- * 组装 全部课程 所有查询条件
+ * 缁勮 鍏ㄩ儴璇剧▼ 鎵�鏈夋煡璇㈡潯浠�
*
* @return
* @version 2.0
@@ -88,7 +88,7 @@
Map<String,Object> result = new HashMap<String,Object>(3);
- // 1.课程分类
+ // 1.璇剧▼鍒嗙被
String firstHql = "select c from OrgCourseCategory c where c.deleteFlag is false and c.categoryLevel = ? order by c.code asc ";
List<OrgCourseCategory> lstFirstCategory = this.find(firstHql,
CollectionUtils.newList(OrgCourseCategory.CATEGORY_LEVEL_FIRST) , OrgCourseCategory.class);
@@ -98,7 +98,7 @@
CollectionUtils.newList(OrgCourseCategory.CATEGORY_LEVEL_SECOND,Organization.ORG_TYPE_DEGREE_EDUCATION) , OrgCourseCategory.class);
- // 1.1 第二层
+ // 1.1 绗簩灞�
Map<String,List<OrgCourseCategory>> secondMap = new HashMap<String,List<OrgCourseCategory>>(lstFirstCategory.size());
for(OrgCourseCategory second : lstSecondCategory ){
if(StringUtils.isNotBlank(second.getParentCategoryId()) && null == secondMap.get(second.getParentCategoryId())){
@@ -108,7 +108,7 @@
}
}
- // 组装的数据格式
+ // 缁勮鐨勬暟鎹牸寮�
Map<String,Object> sMap;
List<Map<String,Object>> lstS ;
@@ -118,7 +118,7 @@
int fIndex = 0;
int sIndex = 0;
- // 循环
+ // 寰幆
for(OrgCourseCategory first : lstFirstCategory){
fIndex = fIndex + 1 ;
@@ -132,7 +132,7 @@
fMap.put("code", first.getCode());
fMap.put("parentId", null);
- // 第二层
+ // 绗簩灞�
if(null != secondMap.get(first.getCategoryId()) ){
for(OrgCourseCategory second : secondMap.get(first.getCategoryId())){
@@ -155,7 +155,7 @@
result.put("course", lstF);
- // 2.排序
+ // 2.鎺掑簭
List<Map<String,Object>> lstSort = new ArrayList<Map<String,Object>>(5);
Map<String,Object> sort;
@@ -171,7 +171,7 @@
}
result.put("sort", lstSort);
- // 3.地区
+ // 3.鍦板尯
List<Map<String,Object>> lstCity = new ArrayList<Map<String,Object>>(6);
Map<String,Object> city;
@@ -194,7 +194,7 @@
public Result insertLevelCategory(String id,String name,String code,String type){
Organization org = read(Organization.class, ClientUtils.getOrgId());
Result result = new Result(true);
- //保存
+ //淇濆瓨
if("save".equals(type)){
OrgCategoryLevel ocl = read(OrgCategoryLevel.class, id);
ocl.setCategoryName(name);
@@ -203,7 +203,7 @@
result.setData(ocl);
return result;
}
- //增加同级
+ //澧炲姞鍚岀骇
if("add".equals(type)){
OrgCategoryLevel ocl0 = read(OrgCategoryLevel.class, id);
OrgCategoryLevel ocl = new OrgCategoryLevel();
@@ -223,7 +223,7 @@
return result;
}
- //增加下级
+ //澧炲姞涓嬬骇
if("addNext".equals(type)){
OrgCategoryLevel parent = read(OrgCategoryLevel.class, id);
OrgCategoryLevel ocl = new OrgCategoryLevel();
@@ -242,7 +242,7 @@
return result;
}
- return new Result(false,"参数错误");
+ return new Result(false,"鍙傛暟閿欒");
}
@@ -254,11 +254,11 @@
OrgCategoryLevel origCateLevel ;
//BeanUtils.copyProperties(ocl, origCateLevel);
if(parent==null){
- // 首层：直接生成
+ // 棣栧眰锛氱洿鎺ョ敓鎴�
levelCode = UUIDUtils.generateUUID();
origLevelCode = levelCode;
}else{
- // 下层：根据parent生成
+ // 涓嬪眰锛氭牴鎹畃arent鐢熸垚
levelCode = parent.getLevelCode()+"00";
}
do {
@@ -267,10 +267,10 @@
origCateLevel = new OrgCategoryLevel();
BeanUtils.copyProperties(ocl , origCateLevel);
- if(parent==null){ // 首层：直接生成
+ if(parent==null){ // 棣栧眰锛氱洿鎺ョ敓鎴�
origCateLevel.setLevel(BigDecimal.ONE.shortValue());
origCateLevel.setLevelCode(levelCode+"_00");
- }else{ // 下层：根据parent生成
+ }else{ // 涓嬪眰锛氭牴鎹畃arent鐢熸垚
origCateLevel.setLevel(new BigDecimal(parent.getLevel()).add(BigDecimal.ONE).shortValue());
origCateLevel.setLevelCode(levelCode);
}
@@ -286,10 +286,10 @@
loop++;
if(parent==null){
- // 首层：直接生成
+ // 棣栧眰锛氱洿鎺ョ敓鎴�
levelCode = origLevelCode.concat(String.valueOf(loop));
}else{
- // 下层：根据parent生成
+ // 涓嬪眰锛氭牴鎹畃arent鐢熸垚
String h = String.valueOf(loop);
if(loop<10){
h = "0"+loop;
@@ -307,8 +307,8 @@
@SuppressWarnings("unused")
private String generateLevelCode(String name) {
- // 转拼音
- //使用微软自带中文输入法用鼠标翻页，选择第一页之后的数据时，会生成(li'zhi.dr)这种账号
+ // 杞嫾闊�
+ //浣跨敤寰蒋鑷甫涓枃杈撳叆娉曠敤榧犳爣缈婚〉锛岄�夋嫨绗竴椤典箣鍚庣殑鏁版嵁鏃讹紝浼氱敓鎴�(li'zhi.dr)杩欑璐﹀彿
String[] arrUnidecode = WordProcessUtils.toPinyin(name," ").replaceAll("'", "").split(" ");
String orgCode = "";
@@ -344,7 +344,7 @@
}
if(flag){
- return new Result(false,"该分类下的科目下存在班级,请先删除班级");
+ return new Result(false,"璇ュ垎绫讳笅鐨勭鐩笅瀛樺湪鐝骇,璇峰厛鍒犻櫎鐝骇");
}
for (OrgCategoryLevel orgCategoryLevel : lstCate) {
hql = " from OrgCollegeCourse where deleteFlag is false and courseCategoryId = ?";
@@ -364,13 +364,13 @@
String hql = " from ClsClass where deleteFlag is false and collegeCourseId = ?";
ClsClass cls = findUnique(hql, CollectionUtils.newList(id), ClsClass.class);
if(cls!=null){
- return new Result(false,"该科目下存在班级,请先删除班级");
+ return new Result(false,"璇ョ鐩笅瀛樺湪鐝骇,璇峰厛鍒犻櫎鐝骇");
}
- //删除所有视频
+ //鍒犻櫎鎵�鏈夎棰�
doDeleteVideo(id);
- //删除所有练习
+ //鍒犻櫎鎵�鏈夌粌涔�
doDeleteExe(id);
- //删除所有讲义
+ //鍒犻櫎鎵�鏈夎涔�
doDeleteHandout(id);
hql = " from OrgCollegeCourse where deleteFlag is false and collegeCourseId = ?";
@@ -418,7 +418,7 @@
}
/**
- * 新增科目
+ * 鏂板绉戠洰
* @param id
* @param name
* @param code
@@ -428,7 +428,7 @@
@Override
public Result addCategory(Organization org, String id, String name, String code, String type) {
Result result = new Result(true);
- //保存
+ //淇濆瓨
if("save".equals(type)){
OrgCategoryLevel ocl = this.read(OrgCategoryLevel.class, id);
ocl.setCategoryName(name);
@@ -437,7 +437,7 @@
result.setData(ocl);
return result;
}
- //增加同级
+ //澧炲姞鍚岀骇
if("add".equals(type)){
OrgCategoryLevel ocl0 = this.read(OrgCategoryLevel.class, id);
OrgCategoryLevel ocl = new OrgCategoryLevel();
@@ -451,11 +451,11 @@
OrgCategoryLevel parent = this.read(OrgCategoryLevel.class, ocl0.getParentId());
TraceUtils.setCreateTrace(ocl);
- result.setData(insertOcl(ocl,parent,name));//插入ocl
+ result.setData(insertOcl(ocl,parent,name));//鎻掑叆ocl
return result;
}
- //增加下级
+ //澧炲姞涓嬬骇
if("addNext".equals(type)){
OrgCategoryLevel parent = this.read(OrgCategoryLevel.class, id);
OrgCategoryLevel ocl = new OrgCategoryLevel();
--
Gitblit v1.8.0