Merge branch 'master1'

# Conflicts:
#	src/main/java/com/edgec/browserbackend/account/controller/AdministratorController.java

src/main/java/com/edgec/browserbackend/account/controller/AdministratorController.java

@@ -3,6 +3,7 @@ package com.edgec.browserbackend.account.controller;
 
 import com.edgec.browserbackend.account.domain.*;
 import com.edgec.browserbackend.account.dto.BillQueryResultDto;
+import com.edgec.browserbackend.account.dto.NoticeDto;
 import com.edgec.browserbackend.account.dto.ResultDto;
 import com.edgec.browserbackend.account.dto.UserUsedDto;
 import com.edgec.browserbackend.account.service.*;
@@ -20,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.query.Param;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -621,9 +621,9 @@ public class AdministratorController {
     /**
      * 迁移ip
      *
-     * @param owner owner
+     * @param owner    owner
      * @param newOwner newOwner
-     * @param ips ips
+     * @param ips      ips
      * @return ResultDto
      */
     @PreAuthorize(Securitys.ADMIN_EL)
@@ -659,6 +659,35 @@ public class AdministratorController {
     public List<PayBack> deleteBack(Integer pay) {
         return payBackService.deletePayBack(pay);
     }
+
+    /**
+     * 设置公告
+     */
+    @PreAuthorize(Securitys.ADMIN_EL)
+    @RequestMapping(path = "/0xadministrator/setNotice", method = RequestMethod.POST)
+    public boolean setNotice(@RequestBody Notice notice) {
+        administratorService.setNotice(notice);
+        return true;
+    }
+
+    /**
+     * 查询公告
+     */
+    @PreAuthorize(Securitys.ADMIN_EL)
+    @RequestMapping(path = "/0xadministrator/getNotice", method = RequestMethod.GET)
+    public NoticeDto getNotice() {
+        return administratorService.getNotice();
+    }
+
+    /**
+     * 删除公告
+     */
+    @PreAuthorize(Securitys.ADMIN_EL)
+    @RequestMapping(path = "/0xadministrator/delNotice", method = RequestMethod.DELETE)
+    public boolean delNotice() {
+        administratorService.delNotice();
+        return true;
+    }
 }
 
 

src/main/java/com/edgec/browserbackend/account/domain/Notice.java

+package com.edgec.browserbackend.account.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@NoArgsConstructor
+@Getter
+@Setter
+@Document(collection = "notices")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Notice {
+
+    @Id
+    private String name;
+
+    private String starDate;
+
+    private String endDate;
+
+    @Length(min = 0, max = 20000)
+    private String content;
+
+    public Notice(String starDate, String endDate, @Length(min = 0, max = 20000) String content) {
+        this.starDate = starDate;
+        this.endDate = endDate;
+        this.content = content;
+    }
+}

src/main/java/com/edgec/browserbackend/account/dto/NoticeDto.java

+package com.edgec.browserbackend.account.dto;
+
+public class NoticeDto {
+
+    String starDate;
+
+    String endDate;
+
+    String content;
+
+    public NoticeDto(String starDate, String endDate, String content) {
+        this.starDate = starDate;
+        this.endDate = endDate;
+        this.content = content;
+    }
+
+    public String getStarDate() {
+        return starDate;
+    }
+
+    public void setStarDate(String starDate) {
+        this.starDate = starDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+}

src/main/java/com/edgec/browserbackend/account/repository/NoticeRepository.java

+package com.edgec.browserbackend.account.repository;
+
+import com.edgec.browserbackend.account.domain.Notice;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface NoticeRepository extends MongoRepository<Notice, String> {
+
+    Notice findOneByNameIsNotNull();
+
+}

src/main/java/com/edgec/browserbackend/account/service/AdministratorService.java

@@ -2,7 +2,6 @@ package com.edgec.browserbackend.account.service;
 
 import com.edgec.browserbackend.account.domain.*;
 import com.edgec.browserbackend.account.dto.*;
-import com.edgec.browserbackend.browser.domain.IpResource;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -70,8 +69,13 @@ public interface AdministratorService {
 
     Long convertToDistributor(String id, boolean tag);
 
-
     List<String> getUsernameIpList(String owner);
 
     List<String> ipMigration(String owner, String newOwner, String ips);
+
+    void setNotice(Notice notice);
+
+    NoticeDto getNotice();
+
+    void delNotice();
 }

src/main/java/com/edgec/browserbackend/account/service/impl/AdministratorServiceImpl.java

@@ -79,6 +79,8 @@ public class AdministratorServiceImpl implements AdministratorService {
     @Autowired
     private ShopRepository shopRepository;
 
+    @Autowired
+    private NoticeRepository noticeRepository;
 
     @Override
     public Administrator createAdministrator(Administrator administrator) {
@@ -769,7 +771,32 @@ public class AdministratorServiceImpl implements AdministratorService {
         }
     }
 
+    @Override
+    public void setNotice(Notice notice) {
+        Notice only = noticeRepository.findOneByNameIsNotNull();
+        if (notice != null) {
+            only.setStarDate(notice.getStarDate());
+            only.setEndDate(notice.getEndDate());
+            only.setContent(notice.getContent());
+            noticeRepository.save(only);
+        } else {
+            noticeRepository.save(notice);
+        }
+    }
 
+    @Override
+    public NoticeDto getNotice() {
+        Notice notice = noticeRepository.findOneByNameIsNotNull();
+        if (notice != null) {
+            return new NoticeDto(notice.getStarDate(), notice.getEndDate(), notice.getContent());
+        }
+        return null;
+    }
+
+    @Override
+    public void delNotice() {
+        noticeRepository.deleteAll();
+    }
 }