优化

src/cn/hmsoft/art/control/enrol/EnrolGatWorksControl.java

@@ -6,6 +6,7 @@ import java.io.FileOutputStream;
 import java.util.List;
 import java.util.zip.ZipOutputStream;
 
+import cn.hmsoft.log.LogHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -58,7 +59,7 @@ public class EnrolGatWorksControl extends ArtControl {
 			agent_id = 100;
 		}
 		String bucketName = ArtParamHelper.getParamValue("OssBucketName", "qmhm-topic");
-		List<StdEnrol> enrolList = null;
+		List<StdEnrol> enrolList;
 		if (aspect_id != null) {
 			enrolList = daoEnrol.listBySql("select * from std_enrol e where e.agent_id=? and e.aspect_id=? and e.std_id in (select std_id from std_reg where std_province >=66)", 
 					agent_id, aspect_id);
@@ -67,7 +68,7 @@ public class EnrolGatWorksControl extends ArtControl {
 					agent_id);
 		}
 		OSSClient ossClient = OssUploadHelper.createClient();
-		if (enrolList != null && enrolList.size() > 0) {
+		if (enrolList != null && !enrolList.isEmpty()) {
 			for (StdEnrol e : enrolList) {
 				String worksUrl = e.getWorks_file();
 				String videoUrl = e.getVideo_file();
@@ -91,7 +92,7 @@ public class EnrolGatWorksControl extends ArtControl {
 					try {
 						OssUploadHelper.ossDownload(ossClient, bucketName, worksUrl, targetPath, chekPointPath);
 					} catch (Throwable e1) {
-						e1.printStackTrace();
+						LogHelper.error(e1.getMessage());
 					}
 				}
 				if (StringHelper.isNotEmpty(videoUrl)) {
@@ -113,7 +114,7 @@ public class EnrolGatWorksControl extends ArtControl {
 					try {
 						OssUploadHelper.ossDownload(ossClient, bucketName, videoUrl, targetPath, chekPointPath);
 					} catch (Throwable e1) {
-						e1.printStackTrace();
+						LogHelper.error(e1.getMessage());
 					}
 				}
 				if (StringHelper.isNotEmpty(materialUrl)) {
@@ -135,7 +136,7 @@ public class EnrolGatWorksControl extends ArtControl {
 					try {
 						OssUploadHelper.ossDownload(ossClient, bucketName, worksUrl, targetPath, chekPointPath);
 					} catch (Throwable e1) {
-						e1.printStackTrace();
+						LogHelper.error(e1.getMessage());
 					}
 				}
 			}
@@ -148,12 +149,10 @@ public class EnrolGatWorksControl extends ArtControl {
 				out = new ZipOutputStream(new FileOutputStream(destFile));
 				ZipHelper.compressDirectory(new File("/data/cafa2022/uploadfile/10047"), out, "/data/cafa2022/uploadfile");
 			} catch (FileNotFoundException e1) {
-				e1.printStackTrace();
+				LogHelper.error(e1.getMessage());
 			}
-			if (ossClient != null) {
-				ossClient.shutdown();
-			}
-		}
+            ossClient.shutdown();
+        }
 		
 	}
 	

src/cn/hmsoft/art/control/enrol/EnrolReportAllControl.java

@@ -46,7 +46,7 @@ public class EnrolReportAllControl extends ArtControl{
 		List<LyGroup> groupArr = this.daoGroup.listGroupByBatch(std_batch, ConfSubjectType.Interview.toString());
 		for (LyGroup group : groupArr) {
 			List<Map<String,Object>> arr = this.daoReport.listCompleteStdByGroup(group.getLy_group_id());
-			if(arr != null && arr.size() >0) {
+			if(arr != null && !arr.isEmpty()) {
 				group.setGroup_std_total(StringHelper.isEmpty(arr.get(0).get("num")) ? 0 : Integer.parseInt(arr.get(0).get("num").toString()));
 				group.setProvince_std_total(StringHelper.isEmpty(arr.get(0).get("province_num")) ? 0 : Integer.parseInt(arr.get(0).get("province_num").toString()));
 				group.setOutside_std_total(StringHelper.isEmpty(arr.get(0).get("out_num")) ? 0 : Integer.parseInt(arr.get(0).get("out_num").toString()));

src/cn/hmsoft/art/enrol/control/reg/EnrolStdRegControl.java

@@ -154,9 +154,9 @@ public class EnrolStdRegControl extends AjaxControl {
 	/**
 	 * PC端考生登陆验证
 	 * 
-	 * @param certId
-	 * @param password
-	 * @return
+	 * @param certId 身份证号
+	 * @param password 密码
+	 * @return 考生信息的 ajax
 	 */
 	@RequestMapping("/enrol/pc/reg/login")
 	public Ajax login(String certId, String password, String validateCode) {
@@ -193,7 +193,7 @@ public class EnrolStdRegControl extends AjaxControl {
 	/**
 	 * pc端上传识别身份证
 	 * 
-	 * @param file
+	 * @param file 上传的文件
 	 * @return
 	 */
 	@RequestMapping("/enrol/pc/reg/idcard/upload")
@@ -244,7 +244,7 @@ public class EnrolStdRegControl extends AjaxControl {
 			}
 
 		} catch (IllegalStateException e) {
-			e.printStackTrace();
+			LogHelper.error(e.getMessage());
 			throw new BusinessException("");
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -286,10 +286,10 @@ public class EnrolStdRegControl extends AjaxControl {
 	/**
 	 * 修改密码
 	 * 
-	 * @param std_id
-	 * @param std_pass_old
-	 * @param std_pass_new
-	 * @return
+	 * @param std_id  考生ID
+	 * @param std_pass_old 旧的密码
+	 * @param std_pass_new 修改后的密码
+	 * @return ajax
 	 */
 	@RequestMapping("/enrol/std/info/password")
 	public Ajax password(String std_id, String std_pass_old, String std_pass_new) {
@@ -317,7 +317,7 @@ public class EnrolStdRegControl extends AjaxControl {
 	
 	/**
 	 * 邮寄省
-	 * @return
+	 * @return ajax
 	 */
 	@RequestMapping("/enrol/std/reg/province/list")
 	public Ajax provinceList(String province_id) {
@@ -326,7 +326,7 @@ public class EnrolStdRegControl extends AjaxControl {
 	
 	/**
 	 * 省下过滤邮寄市
-	 * @return
+	 * @return ajax
 	 */
 	@RequestMapping("/enrol/std/reg/city/list")
 	public Ajax cityList(String province_id) {
@@ -335,7 +335,7 @@ public class EnrolStdRegControl extends AjaxControl {
 	
 	/**
 	 * 所有城市
-	 * @return
+	 * @return ajax
 	 */
 	@RequestMapping("/enrol/std/reg/city/alllist")
 	public Ajax allList(String province_id) {
@@ -366,7 +366,7 @@ public class EnrolStdRegControl extends AjaxControl {
 	
 	/**
 	 * @Description: 央美-根据考生的类型，过滤省份
-	 * @param std_type
+	 * @param std_type 考生类型
 	 * @date 2023-11-06 04:58:42 
 	 */  
 	@RequestMapping("/enrol/province/list/stdType")

src/cn/hmsoft/art/enrol/control/score/EnrolStdScoreControl.java

@@ -75,8 +75,8 @@ public class EnrolStdScoreControl extends EnrolStdAbstractControl {
 
 	/**
 	 * 考生成绩查询.
-	 * @param std_id
-	 * @return
+	 * @param aspect_id 专业ID
+	 * @return 专业成绩Map
 	 */
 	@RequestMapping("/enrol/std/score/aspect")
 	public Ajax listStdAspect( Integer aspect_id) {
@@ -96,8 +96,7 @@ public class EnrolStdScoreControl extends EnrolStdAbstractControl {
 	}
 	
 	/**
-	 * @param std_id
-	 * @return
+	 * @return 专业成绩 List
 	 */
 	@RequestMapping("/enrol/std/score/all/aspect")
 	public Ajax listStdAllAspectScore() {

src/cn/hmsoft/art/enrol/service/EnrolStdEnrolService.java

@@ -828,12 +828,12 @@ public class EnrolStdEnrolService {
 		//西音统考-修改曲目-同步修改兼报专业的曲目
 		if (ArtParamHelper.SchoolCode.equals("10728")
 				&& ArtParamHelper.getParamValue("ShowModifyVariety", FrameStatus.InActive.toString())
-						.equals(FrameStatus.Active.toString())) {
+				.equals(FrameStatus.Active.toString())) {
 			List<StdEnrol> enrolList = daoEnrol.list("std_id", stdEnrol.getStd_id());
-			if(enrolList.size() > 1) {
-				for(StdEnrol se: enrolList) {
-					if(se.getEnrol_id().equals(enrol_id) || (se.getAspect_name().indexOf("音乐表演")== -1 && 
-							se.getAspect_name().indexOf("音乐教育")== -1)) continue;
+			if (enrolList.size() > 1) {
+				for (StdEnrol se : enrolList) {
+					if (se.getEnrol_id().equals(enrol_id) || (!se.getAspect_name().contains("音乐表演") && !se.getAspect_name().contains("音乐教育")))
+						continue;
 					//更新曲目
 					updateStdEnrolTracks(stdEnrol, se);
 				}
@@ -927,8 +927,8 @@ public class EnrolStdEnrolService {
 	/***********************
 	 * 免初试材料
 	 * 
-	 * @param enrol
-	 * @param optr
+	 * @param enrol 报考信息
+	 * @param optr  登录用户
 	 */
 	public void uploadMaterial(StdEnrol enrol, FrameOptr optr) {
 
@@ -961,7 +961,7 @@ public class EnrolStdEnrolService {
 	private boolean isContainsSchool(String school_name) {
 		List<FrameDict> dictArr = FrameDictUtil.getFrameDict("MusicSchool");
 		for (FrameDict dict : dictArr) {
-			if(school_name.indexOf(dict.getDict_value())>-1) {
+			if(school_name.contains(dict.getDict_value())) {
 				return true;
 			}
 		}
@@ -1040,13 +1040,13 @@ public class EnrolStdEnrolService {
 		//如果音教和音表兼报，自动将对应的品种和曲目同步过去
 		List<StdEnrol> enrolList = daoEnrol.list("std_id", std_id);
 		if(enrolList.size() > 1) {
-			for(StdEnrol se: enrolList) {
-				if(se.getEnrol_id().equals(enrol_id) || (se.getAspect_name().indexOf("音乐表演")== -1 && 
-						se.getAspect_name().indexOf("音乐教育")== -1)) continue;
+			for (StdEnrol se : enrolList) {
+				if (se.getEnrol_id().equals(enrol_id) || (!se.getAspect_name().contains("音乐表演") && !se.getAspect_name().contains("音乐教育")))
+					continue;
 				//更新报考科目表中的品种
 				setStdEnrol(se);
 				//写入或者更新曲目
-				setEnrolTracks(se, enrol); 
+				setEnrolTracks(se, enrol);
 			}
 		}
 		
@@ -1057,8 +1057,8 @@ public class EnrolStdEnrolService {
 
 	/**
 	 * @Description: 更新报考曲目
-	 * @param dist
-	 * @param source
+	 * @param dist   需要更新的报考信息
+	 * @param source 源报考信息
 	 * @date 2023-11-15 03:56:09 
 	 */  
 	private void setEnrolTracks(StdEnrol dist, StdEnrol source) {