部分代码格式修改

skyeye-code-doc/src/main/java/com/skyeye/eve/service/impl/CodeModelGroupServiceImpl.java

@@ -190,15 +190,15 @@ public class CodeModelGroupServiceImpl implements CodeModelGroupService{
 		String tableName = ToolUtil.replaceUnderLineAndUpperCase(map.get("tableName").toString());
 		map.put("dbName", dbName);
 		Map<String, Object> tableBz = codeModelGroupDao.queryTableBzByTableName(map);
-		//表备注
+		// 表备注
 		bean.put("tableBzName", tableBz.get("tableComment"));
-		//将表名转化为Controller名
+		// 将表名转化为Controller名
 		bean.put("tableName", tableName);
-		//表名首字母小写
+		// 表名首字母小写
 		bean.put("tableFirstISlowerName", ToolUtil.toLowerCaseFirstOne(tableName));
-		//表名全部小写
+		// 表名全部小写
 		bean.put("tableISlowerName", tableName.toLowerCase());
-		//包名
+		// 包名
 		bean.put("ControllerPackageName", "com.skyeye." + tableName.toLowerCase() + ".controller" );
 		bean.put("ServicePackageName", "com.skyeye." + tableName.toLowerCase() + ".service" );
 		bean.put("ServiceImplPackageName", "com.skyeye." + tableName.toLowerCase() + ".service.impl" );

skyeye-seal-service/src/main/java/com/skyeye/sealservice/util/SealServiceConstants.java → skyeye-common/src/main/java/com/skyeye/common/constans/SealServiceConstants.java

 /*******************************************************************************
  * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
  ******************************************************************************/
-package com.skyeye.sealservice.util;
 
+package com.skyeye.common.constans;
+
+/**
+ *
+ * @ClassName: SealServiceConstants
+ * @Description: 售后工单常量类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/12/3 23:25
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
 public class SealServiceConstants {
 	
 	//获取已经上线的售后服务方式列表的redis的key

skyeye-disk-cloud/src/main/java/com/skyeye/eve/service/impl/FileConsoleServiceImpl.java

@@ -1911,7 +1911,7 @@ public class FileConsoleServiceImpl implements FileConsoleService{
 					folder.put("directParentId", str[str.length - 1]);
 					folder.put("newId", ToolUtil.getSurFaceId());
 				}
-				//将数据转化为树的形式，方便进行父id重新赋值
+				// 将数据转化为树的形式，方便进行父id重新赋值
 				folderNew = ToolUtil.listToTree(folderNew, "id", "directParentId", "children");
 				ToolUtil.FileListParentISEdit(folderNew, folderId);//替换父id
 				folderNew = ToolUtil.FileTreeTransList(folderNew);//将树转为list
@@ -1920,7 +1920,7 @@ public class FileConsoleServiceImpl implements FileConsoleService{
 					folder.put("createTime", DateUtil.getTimeAndToString());
 					folder.put("state", 1);
 				}
-				//为文件重置新parentId参数
+				// 为文件重置新parentId参数
 				for(Map<String, Object> folder: folderNew){
 					String parentId = folder.get("parentId").toString() + folder.get("id").toString() + ",";
 					String newParentId = folder.get("newParentId").toString() + folder.get("newId").toString() + ",";

skyeye-entity/src/main/java/com/skyeye/eve/entity/quartz/SysQuartz.java

@@ -4,6 +4,7 @@
 
 package com.skyeye.eve.entity.quartz;
 
+import com.skyeye.annotation.api.ApiEntityColumn;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -22,6 +23,7 @@ public class SysQuartz implements Serializable {
 
 	private Integer status;
 
+	@ApiEntityColumn("时间点")
 	private String cron;
 
 	private String remark;

skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpMachinServiceImpl.java

@@ -164,7 +164,6 @@ public class ErpMachinServiceImpl implements ErpMachinService {
 	    * @return void    返回类型
 	    * @throws
 	 */
-	@SuppressWarnings("unchecked")
 	private List<Map<String, Object>> rsetMachinMaterial(String materielStr, String useId){
 		//处理数据
 		List<Map<String, Object>> jArray = JSONUtil.toList(materielStr, null);
@@ -194,7 +193,6 @@ public class ErpMachinServiceImpl implements ErpMachinService {
 	    * @return List<Map<String,Object>>    返回类型
 	    * @throws
 	 */
-	@SuppressWarnings("unchecked")
 	private List<Map<String, Object>> rsetMachinChild(String procedureStr, String useId, String number) throws Exception{
 		//处理数据
 		List<Map<String, Object>> jArray = JSONUtil.toList(procedureStr, null);

skyeye-exam/src/main/java/com/skyeye/eve/service/impl/ExamServiceImpl.java

@@ -1133,7 +1133,6 @@ public class ExamServiceImpl implements ExamService{
 	     * @return Map<String,Object>    返回类型
 	     * @throws
 	 */
-	@SuppressWarnings("unchecked")
 	public Map<String, Object> getQuestionOptionReportListMation(Map<String, Object> question) throws Exception {
 		String quType = QuType.getActionName(Integer.parseInt(question.get("quType").toString()));//获取题目类型
 		if (quType.equals(QuType.RADIO.getActionName()) || quType.equals(QuType.COMPRADIO.getActionName())) {//单选  复合单选

skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ForumContentServiceImpl.java

@@ -267,7 +267,6 @@ public class ForumContentServiceImpl implements ForumContentService {
 	     * @return void    返回类型
 	     * @throws
 	 */ 
-	@SuppressWarnings("unchecked")
 	@Override
 	public void queryForumContentMationToDetails(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();

skyeye-gateway/src/main/java/com/skyeye/eve/service/impl/CrmPageServiceImpl.java

 /*******************************************************************************
  * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
  ******************************************************************************/
-package com.skyeye.eve.service.impl;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+package com.skyeye.eve.service.impl;
 
 import com.skyeye.common.object.InputObject;
 import com.skyeye.common.object.OutputObject;
 import com.skyeye.eve.dao.CrmPageDao;
 import com.skyeye.eve.service.CrmPageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class CrmPageServiceImpl implements CrmPageService {

skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/LinkOrImageBeanTmp.java

 /*******************************************************************************
  * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
  ******************************************************************************/
+
 package com.youbenzi.md2.markdown;
 
 public class LinkOrImageBeanTmp {

skyeye-message/src/main/java/com/skyeye/eve/service/impl/SysNoticeTypeServiceImpl.java

@@ -265,7 +265,6 @@ public class SysNoticeTypeServiceImpl implements SysNoticeTypeService {
 	     * @return void    返回类型
 	     * @throws
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void queryFirstSysNoticeTypeUpStateList(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();
@@ -292,7 +291,6 @@ public class SysNoticeTypeServiceImpl implements SysNoticeTypeService {
 	     * @return void    返回类型
 	     * @throws
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void querySecondSysNoticeTypeUpStateList(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();

skyeye-mq/src/main/java/com/skyeye/service/impl/JobMateMationServiceImpl.java

@@ -130,6 +130,7 @@ public class JobMateMationServiceImpl implements JobMateMationService {
 	 * 任务状态修改
 	 */
 	@Override
+	@Transactional(value="transactionManager")
 	public void comMQJobMation(String jobId, String status, String responseBody) throws Exception {
 		Map<String, Object> jobMation = jobMateMationDao.queryJobMationByJobId(jobId);
 		// 类型  1.父任务2.子任务

skyeye-note/src/main/java/com/skyeye/mq/job/impl/OutputNotesIsZipServiceImpl.java

@@ -57,7 +57,6 @@ public class OutputNotesIsZipServiceImpl implements JobMateService{
 	@Autowired
 	private MyNoteDao myNoteDao;
 	
-	@SuppressWarnings("unchecked")
 	@Override
 	public void call(String data) throws Exception {
 		Map<String, Object> map = JSONUtil.toBean(data, null);
@@ -98,7 +97,6 @@ public class OutputNotesIsZipServiceImpl implements JobMateService{
 	    * @return void    返回类型
 	    * @throws
 	 */
-	@SuppressWarnings("unchecked")
 	private String outputFolder(String parentId, String userId) throws Exception{
 		// 1.获取该目录下的所有目录
 		List<Map<String, Object>> beans = myNoteDao.queryAllFolderListByFolderId(parentId);

skyeye-pro/src/main/java/com/skyeye/service/impl/ProCostExpenseTypeServiceImpl.java

@@ -91,7 +91,6 @@ public class ProCostExpenseTypeServiceImpl implements ProCostExpenseTypeService
      * @param outputObject
      * @throws Exception
      */
-    @SuppressWarnings("unchecked")
 	@Override
     public void queryStateUpList(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();

skyeye-quartz/src/main/java/com/skyeye/eve/service/impl/SysQuartzServiceImpl.java

@@ -22,6 +22,16 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+/**
+ *
+ * @ClassName: SysQuartzServiceImpl
+ * @Description: 定时任务服务类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/12/3 23:29
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
 @Service
 public class SysQuartzServiceImpl implements SysQuartzService {
 

skyeye-rmprogram/src/main/java/com/skyeye/eve/service/impl/RmGroupMemberServiceImpl.java

@@ -23,6 +23,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ *
+ * @ClassName: RmGroupMemberServiceImpl
+ * @Description: 小程序组件管理服务类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/12/3 23:29
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
 @Service
 public class RmGroupMemberServiceImpl implements RmGroupMemberService{
 	

skyeye-school-phone/src/main/resources/mapper/schoolphone/SchoolStuExamMapper.xml

@@ -17,8 +17,7 @@
 			LEFT JOIN school_subject_mation d ON c.subject_id = d.id
 			LEFT JOIN sys_eve_user_staff e ON c.create_id = e.user_id
 			LEFT JOIN school_grade_mation f ON c.grade_id = f.id
-		WHERE
-			a.id = #{stuId}
+		WHERE a.id = #{stuId}
 		AND a.now_class_id = b.class_id
 		AND c.id = b.exam_survey_id
 		AND c.survey_state = '1'
@@ -56,8 +55,7 @@
 			LEFT JOIN sys_eve_user_staff e ON c.create_id = e.user_id
 			LEFT JOIN school_grade_mation f ON c.grade_id = f.id,
 			exam_survey_answer g
-		WHERE
-			a.id = #{stuId}
+		WHERE a.id = #{stuId}
 		AND a.id = g.create_id
 		AND c.id = g.survey_id
 		ORDER BY c.real_start_time DESC

skyeye-seal-service/src/main/java/com/skyeye/service/impl/SealSeServiceEvaluateTypeServiceImpl.java

@@ -13,7 +13,7 @@ import com.skyeye.common.util.DateUtil;
 import com.skyeye.common.util.ToolUtil;
 import com.skyeye.dao.SealSeServiceEvaluateTypeDao;
 import com.skyeye.jedis.JedisClientService;
-import com.skyeye.sealservice.util.SealServiceConstants;
+import com.skyeye.common.constans.SealServiceConstants;
 import com.skyeye.service.SealSeServiceEvaluateTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

skyeye-seal-service/src/main/java/com/skyeye/service/impl/SealSeServiceFaultTypeServiceImpl.java

@@ -13,7 +13,7 @@ import com.skyeye.common.util.DateUtil;
 import com.skyeye.common.util.ToolUtil;
 import com.skyeye.dao.SealSeServiceFaultTypeDao;
 import com.skyeye.jedis.JedisClientService;
-import com.skyeye.sealservice.util.SealServiceConstants;
+import com.skyeye.common.constans.SealServiceConstants;
 import com.skyeye.service.SealSeServiceFaultTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

skyeye-seal-service/src/main/java/com/skyeye/service/impl/SealSeServiceFeedbackTypeServiceImpl.java

@@ -13,7 +13,7 @@ import com.skyeye.common.util.DateUtil;
 import com.skyeye.common.util.ToolUtil;
 import com.skyeye.dao.SealSeServiceFeedbackTypeDao;
 import com.skyeye.jedis.JedisClientService;
-import com.skyeye.sealservice.util.SealServiceConstants;
+import com.skyeye.common.constans.SealServiceConstants;
 import com.skyeye.service.SealSeServiceFeedbackTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

skyeye-seal-service/src/main/java/com/skyeye/service/impl/SealSeServiceModeServiceImpl.java

@@ -13,7 +13,7 @@ import com.skyeye.common.util.DateUtil;
 import com.skyeye.common.util.ToolUtil;
 import com.skyeye.dao.SealSeServiceModeDao;
 import com.skyeye.jedis.JedisClientService;
-import com.skyeye.sealservice.util.SealServiceConstants;
+import com.skyeye.common.constans.SealServiceConstants;
 import com.skyeye.service.SealSeServiceModeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

skyeye-seal-service/src/main/java/com/skyeye/service/impl/SealSeServiceTypeServiceImpl.java

@@ -13,7 +13,7 @@ import com.skyeye.common.util.DateUtil;
 import com.skyeye.common.util.ToolUtil;
 import com.skyeye.dao.SealSeServiceTypeDao;
 import com.skyeye.jedis.JedisClientService;
-import com.skyeye.sealservice.util.SealServiceConstants;
+import com.skyeye.common.constans.SealServiceConstants;
 import com.skyeye.service.SealSeServiceTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

skyeye-seal-service/src/main/java/com/skyeye/service/impl/SealSeServiceUrgencyServiceImpl.java

@@ -13,7 +13,7 @@ import com.skyeye.common.util.DateUtil;
 import com.skyeye.common.util.ToolUtil;
 import com.skyeye.dao.SealSeServiceUrgencyDao;
 import com.skyeye.jedis.JedisClientService;
-import com.skyeye.sealservice.util.SealServiceConstants;
+import com.skyeye.common.constans.SealServiceConstants;
 import com.skyeye.service.SealSeServiceUrgencyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

skyeye-solr/src/main/java/com/skyeye/solr/Forum.java

 /*******************************************************************************
  * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
  ******************************************************************************/
-package com.skyeye.solr;
 
-import java.io.Serializable;
+package com.skyeye.solr;
 
+import lombok.Data;
 import org.apache.solr.client.solrj.beans.Field;
 import org.springframework.data.solr.core.mapping.SolrDocument;
 
+import java.io.Serializable;
+
+@Data
 @SolrDocument(solrCoreName = "custom_core")
 public class Forum implements Serializable {
 
@@ -54,92 +57,4 @@ public class Forum implements Serializable {
 		this.createTime = createTime;
 	}
 
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getForumContent() {
-		return forumContent;
-	}
-
-	public void setForumContent(String forumContent) {
-		this.forumContent = forumContent;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public String getReportState() {
-		return reportState;
-	}
-
-	public void setReportState(String reportState) {
-		this.reportState = reportState;
-	}
-
-	public String getTagId() {
-		return tagId;
-	}
-
-	public void setTagId(String tagId) {
-		this.tagId = tagId;
-	}
-
-	public String getForumTitle() {
-		return forumTitle;
-	}
-
-	public void setForumTitle(String forumTitle) {
-		this.forumTitle = forumTitle;
-	}
-
-	public String getForumDesc() {
-		return forumDesc;
-	}
-
-	public void setForumDesc(String forumDesc) {
-		this.forumDesc = forumDesc;
-	}
-
-	public String getAnonymous() {
-		return anonymous;
-	}
-
-	public void setAnonymous(String anonymous) {
-		this.anonymous = anonymous;
-	}
-
-	public String getCreateId() {
-		return createId;
-	}
-
-	public void setCreateId(String createId) {
-		this.createId = createId;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
 }

skyeye-survey/src/main/java/com/skyeye/eve/service/impl/DwSurveyDirectoryServiceImpl.java

@@ -29,7 +29,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-
+/**
+ *
+ * @ClassName: DwSurveyDirectoryServiceImpl
+ * @Description: 问卷功能服务类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/12/3 23:26
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
 @Service
 public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
 	

skyeye-user-phone/src/main/java/com/skyeye/service/impl/TAreaPhoneServiceImpl.java

 /*******************************************************************************
  * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
  ******************************************************************************/
+
 package com.skyeye.service.impl;
 
 import cn.hutool.json.JSONUtil;
@@ -36,7 +37,6 @@ public class TAreaPhoneServiceImpl implements TAreaPhoneService{
 	     * @return void    返回类型
 	     * @throws
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void queryTAreaPhoneList(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();

skyeye-workplan/src/main/java/com/skyeye/eve/service/impl/SysWorkPlanServiceImpl.java

@@ -19,7 +19,6 @@ import com.skyeye.eve.dao.ScheduleDayDao;
 import com.skyeye.eve.dao.SysWorkPlanDao;
 import com.skyeye.eve.service.ScheduleDayService;
 import com.skyeye.eve.service.SysWorkPlanService;
-import com.skyeye.jedis.JedisClientService;
 import com.skyeye.quartz.config.QuartzService;
 import com.skyeye.service.JobMateMationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,9 +50,6 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService{
 	@Autowired
 	private QuartzService quartzService;
 	
-	@Autowired
-	public JedisClientService jedisClient;
-	
 	@Autowired
 	private ScheduleDayDao scheduleDayDao;