Skip to content

S
saasio
Commit 159549da by manxiaoqiang
Options

reged

parent 66a27b62
Showing with 59 additions and 46 deletions
src/main/java/com/reyun/model/IONotice.java
......@@ -40,6 +40,8 @@ public class IONotice {
private Boolean release;
private boolean isRead;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() {
......@@ -220,4 +222,13 @@ public class IONotice {
public void setRelease(Boolean release) {
this.release = release;
}
@Transient
public boolean getIsRead() {
return isRead;
}
public void setIsRead(boolean isRead) {
this.isRead = isRead;
}
}
src/main/java/com/reyun/repository/NoticeRepository.java
......@@ -13,7 +13,7 @@ import java.util.List;
@Transactional
public interface NoticeRepository extends JpaRepository<IONotice, Long> {
@Query(value = "select * from notice n where n.isdeploy is true and (io_account = ?1 or io_account = -1) order by id desc", nativeQuery = true)
@Query(value = "select * from ionotice n where n.isdeploy is true and (io_account = ?1 or io_account = -1) order by id desc", nativeQuery = true)
List<IONotice> listRecentDeployNotice(Long account);
......
src/main/java/com/reyun/service/NoticeService.java
package com.reyun.service;
import com.reyun.model.IONotice;
import com.reyun.model.Notice;
import com.reyun.model.UserNoticeLog;
......@@ -15,7 +16,7 @@ public interface NoticeService {
* @param accountId
* @return
*/
List<Notice> listRecentDeployNotice(Long accountId);
List<IONotice> listRecentDeployNotice(Long accountId);
/**
* 存储用户已读公告数据
......
src/main/java/com/reyun/service/impl/NoticeServiceImpl.java
......@@ -2,6 +2,7 @@ package com.reyun.service.impl;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import com.reyun.model.IONotice;
import com.reyun.model.Notice;
import com.reyun.model.UserNoticeLog;
import com.reyun.repository.NoticeRepository;
......@@ -27,15 +28,15 @@ public class NoticeServiceImpl implements NoticeService {
private UserNoticeLogRepository userNoticeLogRepository;
@Override
public List<Notice> listRecentDeployNotice(Long accountId) {
public List<IONotice> listRecentDeployNotice(Long accountId) {
List<Notice> recentDeployNoticeList = noticeRepository.listRecentDeployNotice(accountId);
List<IONotice> recentDeployNoticeList = noticeRepository.listRecentDeployNotice(accountId);
if (!CollectionUtils.isEmpty(recentDeployNoticeList)) {
List<Long> noticeIdList = Lists.transform(recentDeployNoticeList, new Function<Notice, Long>() {
List<Long> noticeIdList = Lists.transform(recentDeployNoticeList, new Function<IONotice, Long>() {
@Override
public Long apply(Notice notice) {
public Long apply(IONotice notice) {
return notice.getId();
}
});
......@@ -43,7 +44,7 @@ public class NoticeServiceImpl implements NoticeService {
for (UserNoticeLog userNoticeLog : userNoticeLogList) {
for (Notice notice : recentDeployNoticeList) {
for (IONotice notice : recentDeployNoticeList) {
if (notice.getId().equals(userNoticeLog.getNoticeid())) {
notice.setIsRead(true);
......
src/main/webapp/activation.html
......@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.11499847006052732">
<script src="scripts/change.js?r=0.5983042535372078"></script>
<script src="scripts/regcom1.js?r=0.30919134919531643"></script>
<script src="scripts/regui.js?r=0.5395845742896199"></script>
<link rel="stylesheet" href="styles/login.css?r=0.17377914488315582">
<script src="scripts/change.js?r=0.038060850696638227"></script>
<script src="scripts/regcom1.js?r=0.22607403295114636"></script>
<script src="scripts/regui.js?r=0.01922464300878346"></script>
</head>
<body ng-app="app" ng-controller="acvitationCtrl">
......
src/main/webapp/demo.html
......@@ -7,8 +7,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<script src="scripts/change.js?r=0.3096894088666886"></script>
<script src="scripts/demo.js?r=0.49110986455343664"></script>
<script src="scripts/change.js?r=0.1720105002168566"></script>
<script src="scripts/demo.js?r=0.14105754997581244"></script>
<script type="text/javascript">
$.get("/api/demo",function(data) {
......
src/main/webapp/failure.html
......@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.7820607058238238">
<script src="scripts/change.js?r=0.4579346068203449"></script>
<script src="scripts/regcom2.js?r=0.053647717693820596"></script>
<script src="scripts/failure.js?r=0.9843989037908614"></script>
<link rel="stylesheet" href="styles/login.css?r=0.5653473353013396">
<script src="scripts/change.js?r=0.03278528619557619"></script>
<script src="scripts/regcom2.js?r=0.8621854139491916"></script>
<script src="scripts/failure.js?r=0.29478811798617244"></script>
</head>
<body ng-app="app" ng-controller="failureCtrl">
......
src/main/webapp/forget.html
......@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.16757301287725568">
<script src="scripts/change.js?r=0.8997952970676124"></script>
<script src="scripts/regcom3.js?r=0.05138346133753657"></script>
<script src="scripts/forget.js?r=0.5629009127151221"></script>
<link rel="stylesheet" href="styles/login.css?r=0.6822654716670513">
<script src="scripts/change.js?r=0.657221358967945"></script>
<script src="scripts/regcom3.js?r=0.84271992999129"></script>
<script src="scripts/forget.js?r=0.2713923347182572"></script>
</head>
<body ng-app="app" ng-controller="forgetCtrl">
......
src/main/webapp/home1.html
......@@ -7,11 +7,11 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/home.css?r=0.4897955828346312">
<link rel="stylesheet" href="styles/home.css?r=0.7975225732661784">
<script src="scripts/change.js?r=0.3161861866246909"></script>
<script src="scripts/home.js?r=0.41972410725429654"></script>
<script src="scripts/homectrl.js?r=0.3761741151101887"></script>
<script src="scripts/change.js?r=0.3572810667101294"></script>
<script src="scripts/home.js?r=0.005558168049901724"></script>
<script src="scripts/homectrl.js?r=0.6156439066398889"></script>
<script>
var _hmt = _hmt || [];
......
src/main/webapp/index.html
......@@ -8,12 +8,12 @@
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/index.css?r=0.1538209819700569">
<script src="scripts/change.js?r=0.7190487270709127"></script>
<script src="scripts/com.js?r=0.1410635078791529"></script>
<script src="scripts/app.js?r=0.5087753545958549"></script>
<link rel="stylesheet" href="styles/index.css?r=0.5801727620419115">
<script src="scripts/change.js?r=0.7636903643142432"></script>
<script src="scripts/com.js?r=0.22119453037157655"></script>
<script src="scripts/app.js?r=0.4161588044371456"></script>
<script src="scripts/ui.js?r=0.08424989180639386"></script>
<script src="scripts/ui.js?r=0.7564062932506204"></script>
</head>
<body ng-app="app" ng-controller="indexCtrl" ng-class="{'noreport':backReport}">
......
src/main/webapp/login.html
......@@ -7,11 +7,11 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.9707226229365915">
<link rel="stylesheet" href="styles/login.css?r=0.24616998224519193">
<script src="scripts/change.js?r=0.7923258431255817"></script>
<script src="scripts/lgcom4.js?r=0.473345436854288"></script>
<script src="scripts/lgui.js?r=0.5988887476269156"></script>
<script src="scripts/change.js?r=0.12761787860654294"></script>
<script src="scripts/lgcom4.js?r=0.1754848170094192"></script>
<script src="scripts/lgui.js?r=0.09166066627949476"></script>
<script>
var _hmt = _hmt || [];
......
src/main/webapp/olduser.html
......@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.6317339739762247">
<script src="scripts/change.js?r=0.7653584356885403"></script>
<script src="scripts/regcom5.js?r=0.6032860425766557"></script>
<script src="scripts/olduser.js?r=0.24770011520013213"></script>
<link rel="stylesheet" href="styles/login.css?r=0.5256118897814304">
<script src="scripts/change.js?r=0.19494965951889753"></script>
<script src="scripts/regcom5.js?r=0.7030478441156447"></script>
<script src="scripts/olduser.js?r=0.805714696412906"></script>
</head>
<body ng-app="app" ng-controller="olduserCtrl">
......
src/main/webapp/resetpwd.html
......@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.7661028518341482">
<script src="scripts/change.js?r=0.2717249090783298"></script>
<script src="scripts/regcom7.js?r=0.21323158033192158"></script>
<script src="scripts/resetpwd.js?r=0.5238363628741354"></script>
<link rel="stylesheet" href="styles/login.css?r=0.16613134928047657">
<script src="scripts/change.js?r=0.36895587225444615"></script>
<script src="scripts/regcom7.js?r=0.7115389341488481"></script>
<script src="scripts/resetpwd.js?r=0.39234541240148246"></script>
</head>
<body ng-app="app" ng-controller="resetpwdCtrl">
......
src/main/webapp/success.html
......@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0" name="viewport">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="styles/login.css?r=0.8155621050391346">
<script src="scripts/change.js?r=0.48537470446899533"></script>
<script src="scripts/regcom8.js?r=0.015657729003578424"></script>
<script src="scripts/success.js?r=0.23272478976286948"></script>
<link rel="stylesheet" href="styles/login.css?r=0.9278655003290623">
<script src="scripts/change.js?r=0.08022567885927856"></script>
<script src="scripts/regcom8.js?r=0.8265951636712998"></script>
<script src="scripts/success.js?r=0.4393018090631813"></script>
</head>
<body ng-app="app" ng-controller="successCtrl">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment