Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!242

src/main/java/cn/timer/api/controller/LoginController.java

@@ -34,6 +34,7 @@ import cn.timer.api.aspect.lang.annotation.Log;
 import cn.timer.api.aspect.lang.enums.BusinessType;
 import cn.timer.api.bean.jxgl.JxglBasicSetting;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
+import cn.timer.api.bean.qyxx.CmsContent;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
@@ -140,6 +141,15 @@ public class LoginController {
 	@Value("${config-8timer.Aliyun.expirationTime_pri}")
 	private String expirationTime_pri;
 
+	@Value("${config-8timer.qyxx.title}")
+	private String title;
+	@Value("${config-8timer.qyxx.author}")
+	private String author;
+	@Value("${config-8timer.qyxx.cover}")
+	private String cover;
+	@Value("${config-8timer.qyxx.summary}")
+	private String summary;
+
 	@Autowired
 	private HttpSession session;
 
@@ -579,6 +589,24 @@ public class LoginController {
 				}
 			}
 
+			/********** 默认企业讯息添加 ***********/
+			CmsContent cmsContent = CmsContent.builder().build();
+
+			cmsContent.setTitle(title);
+			cmsContent.setPublisherName(author);
+			cmsContent.setAuthor(author);
+			cmsContent.setModularid(1);
+			cmsContent.setFmtpath(cover);
+			cmsContent.setSummary(summary);
+			cmsContent.setStatus(1);
+			cmsContent.setOrganizationId(qyId);
+			cmsContent.setReleasestate(0);
+			cmsContent.setAddeddate(new Date().getTime());
+			cmsContent.setReleasetime(String.valueOf(new Date().getTime()));
+			cmsContent.insert();
+
+			/********** 默认企业讯息添加 ***********/
+
 			return ResultUtil.success("注册企业成功");
 		} catch (Exception e) {
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -34,7 +34,6 @@ import cn.timer.api.bean.qyxx.CmsIsRead;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
-import cn.timer.api.dao.qyxx.CmsAnnouncementMapper;
 import cn.timer.api.dao.qyxx.CmsContentMapper;
 import cn.timer.api.dao.qyxx.CmsIsReadMapper;
 import cn.timer.api.dto.qyxx.CmsContentDto;
@@ -57,8 +56,8 @@ public class CmsController {
 	@Autowired
 	private CmsIsReadMapper cmsIsReadMapper;
 
-	@Autowired
-	private CmsAnnouncementMapper cmsAnnouncementMapper;
+//	@Autowired
+//	private CmsAnnouncementMapper cmsAnnouncementMapper;
 
 	/**
 	 * 查询所有讯息

src/main/resources/application-dev.yml

@@ -201,7 +201,12 @@ config-8timer:
     two: 7
     three: 30
   init-password: 123456
-  
+  # 创建企业默认添加讯息
+  qyxx:
+     title: '欢迎来到8小时'
+     cover: 'https://8time-v2.oss-cn-shenzhen.aliyuncs.com/8timer2.0/common/qyxx/welcome/fb3558d8d91e16efe9b6eec5fa81447.png'
+     summary: '<h1>欢迎来到8小时！可先前往组织管理-组织架构添加公司架构及岗位，再前往员工管理-员工名册添加企业员工。</h1>'
+     author: 'System'
   # 客户管理导入服务器保存路径
   crm-excel:
      realPath: 'D:/excel/'

src/main/resources/application-pro.yml

@@ -173,6 +173,13 @@ config-8timer:
     three: 30
   init-password: 123456
   
+  # 创建企业默认添加讯息
+  qyxx:
+     title: '欢迎来到8小时'
+     cover: 'https://8time-v2.oss-cn-shenzhen.aliyuncs.com/8timer2.0/common/qyxx/welcome/fb3558d8d91e16efe9b6eec5fa81447.png'
+     summary: '<h1>欢迎来到8小时！可先前往组织管理-组织架构添加公司架构及岗位，再前往员工管理-员工名册添加企业员工。</h1>'
+     author: 'System'
+  
   # 客户管理导入服务器保存路径
   crm-excel:
      realPath: '/data/crm-excel/'
\ No newline at end of file

src/main/resources/application-test.yml

@@ -172,6 +172,13 @@ config-8timer:
     three: 30
   init-password: 123456
   
+  # 创建企业默认添加讯息
+  qyxx:
+     title: '欢迎来到8小时'
+     cover: 'https://8time-v2.oss-cn-shenzhen.aliyuncs.com/8timer2.0/common/qyxx/welcome/fb3558d8d91e16efe9b6eec5fa81447.png'
+     summary: '<h1>欢迎来到8小时！可先前往组织管理-组织架构添加公司架构及岗位，再前往员工管理-员工名册添加企业员工。</h1>'
+     author: 'System'
+  
   # 客户管理导入服务器保存路径
   crm-excel:
      realPath: '/data/crm-excel/'
\ No newline at end of file