diff --git a/pom.xml b/pom.xml
index 2eff17b..2c81ad5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.fjy
spring
- 0.0.1-SNAPSHOT
+ V2.4 RC2
jar
spring
diff --git a/src/main/java/com/fjy/spring/controller/DataController.java b/src/main/java/com/fjy/spring/controller/DataController.java
index ba12597..8191b5d 100644
--- a/src/main/java/com/fjy/spring/controller/DataController.java
+++ b/src/main/java/com/fjy/spring/controller/DataController.java
@@ -12,10 +12,8 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.text.SimpleDateFormat;
+import java.util.*;
import static com.fjy.spring.constant.GlobalConstant.USER_SESSION_KEY;
@@ -53,6 +51,9 @@ public class DataController {
@Autowired
private VersionService versionService;
+ @Autowired
+ private AdminService adminService;
+
@Resource
private HttpServletRequest httpServletRequest;
@@ -183,6 +184,25 @@ public class DataController {
return noticeService.findAll();
}
+ @PostMapping("/home/admin/addNotice")
+ public boolean addNotice(String content){
+ TbUser user= (TbUser)httpServletRequest.getSession().getAttribute(USER_SESSION_KEY);
+ TbNotice notice = new TbNotice();
+ Date date = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String dateNowStr = sdf.format(date);
+ Optional vAdmin = adminService.findAdminByUserId(user.getColuserid());
+ if (vAdmin.isPresent()){
+ VAdmin admin = vAdmin.get();
+ notice.setAdminid(admin.getAdminid());
+ notice.setIssueTime(dateNowStr);
+ notice.setNoticeContent(content);
+ return noticeService.addOne(notice)!=null;
+ }else
+ return false;
+
+ }
+
@PostMapping("/home/admin/addoneversion")
public boolean addOneVersion(TbVersion version){
//log.info(version.toString());
diff --git a/src/main/java/com/fjy/spring/domain/VAdmin.java b/src/main/java/com/fjy/spring/domain/VAdmin.java
new file mode 100644
index 0000000..586558b
--- /dev/null
+++ b/src/main/java/com/fjy/spring/domain/VAdmin.java
@@ -0,0 +1,25 @@
+package com.fjy.spring.domain;
+
+import lombok.Data;
+import org.hibernate.annotations.Immutable;
+import org.hibernate.annotations.Subselect;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@Immutable
+@Subselect("SELECT * FROM v_admin")
+@Data
+public class VAdmin {
+ @Id
+ @Column(name = "coluserid")
+ private Integer userid;
+
+ private Integer adminid;
+
+ private String coltime;
+
+ private String colname;
+}
diff --git a/src/main/java/com/fjy/spring/repository/VAdminRepository.java b/src/main/java/com/fjy/spring/repository/VAdminRepository.java
new file mode 100644
index 0000000..02976ce
--- /dev/null
+++ b/src/main/java/com/fjy/spring/repository/VAdminRepository.java
@@ -0,0 +1,7 @@
+package com.fjy.spring.repository;
+
+import com.fjy.spring.domain.VAdmin;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface VAdminRepository extends JpaRepository {
+}
diff --git a/src/main/java/com/fjy/spring/service/AdminService.java b/src/main/java/com/fjy/spring/service/AdminService.java
index a7b761d..5dc27fc 100644
--- a/src/main/java/com/fjy/spring/service/AdminService.java
+++ b/src/main/java/com/fjy/spring/service/AdminService.java
@@ -1,7 +1,9 @@
package com.fjy.spring.service;
import com.fjy.spring.domain.TbAdmin;
+import com.fjy.spring.domain.VAdmin;
import com.fjy.spring.repository.TbAdminRepository;
+import com.fjy.spring.repository.VAdminRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -12,7 +14,14 @@ public class AdminService {
@Autowired
private TbAdminRepository adminRepository;
+ @Autowired
+ private VAdminRepository vAdminRepository;
+
public Optional findAdminById(Integer id){
return adminRepository.findByUserid(id);
}
+
+ public Optional findAdminByUserId(Integer id){
+ return vAdminRepository.findById(id);
+ }
}
diff --git a/src/main/java/com/fjy/spring/service/NoticeService.java b/src/main/java/com/fjy/spring/service/NoticeService.java
index 0b1ac51..79bd719 100644
--- a/src/main/java/com/fjy/spring/service/NoticeService.java
+++ b/src/main/java/com/fjy/spring/service/NoticeService.java
@@ -17,4 +17,7 @@ public class NoticeService {
return noticeRepository.findAll();
}
+ public TbNotice addOne(TbNotice notice){
+ return noticeRepository.save(notice);
+ }
}
diff --git a/src/main/resources/static/js/admin.js b/src/main/resources/static/js/admin.js
index 72bc3d2..f351bc1 100644
--- a/src/main/resources/static/js/admin.js
+++ b/src/main/resources/static/js/admin.js
@@ -1,6 +1,9 @@
var Main = {
data() {
return {
+ NoticeForm: {
+ content: ''
+ },
activeIndex: '1',
form: {
content: '',
@@ -61,6 +64,25 @@ var Main = {
})
},
methods: {
+ openNotiSuccess(title, content) {
+ this.$notify({
+ title: title,
+ message: content,
+ type: 'success'
+ });
+ },
+ openNotiError(title, content) {
+ this.$notify.error({
+ title: title,
+ message: content
+ });
+ },
+ openSuccess(content) {
+ this.$message({
+ message: content,
+ type: 'success'
+ });
+ },
uploadURL(row) {
return getRootPath_web()+"/home/moreUpload?rename=false";
},
@@ -81,6 +103,50 @@ var Main = {
},
onSubmit() {
console.log('submit!');
+ },submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ let that = this;
+ if (valid) {
+ axios({
+ url: getRootPath_web()+'/home/admin/addNotice',
+ method: 'post',
+ data: {
+ content: this.$refs.content.value
+ },
+ transformRequest: [function (data) {
+ // Do whatever you want to transform the data
+ let ret = ''
+ for (let it in data) {
+ ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+ }
+ return ret
+ }],
+ headers: {
+ 'Content-Type': 'application/x-www-form-urlencoded'
+ }
+ }).then(function (response) {
+ console.log(response.data);
+ if (response.data===true){
+ //that.$refs[formName].submit;
+ //return true;
+ that.openNotiSuccess("成功", "发布成功！")
+ }else if (response.data===false){
+ that.openNotiError("失败", "发布失败！");
+ }else {
+ that.openNotiError("错误", response.data.message);
+ }
+ }).catch(function (error) {
+ console.log(error);
+ that.openNotiError("错误", "服务器错误！");
+ });
+ //console.log(this.$refs.content.value)
+ //this.$options.methods.openNotiSuccess.bind(this)();
+ //alert('submit!');
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
}
}
}
diff --git a/src/main/resources/templates/home/admin.html b/src/main/resources/templates/home/admin.html
index 03eaf17..fa72c09 100644
--- a/src/main/resources/templates/home/admin.html
+++ b/src/main/resources/templates/home/admin.html
@@ -35,12 +35,13 @@
发布公告
-
+
-
+
- 添加
+ 添加