test配置

pom.xml

@@ -65,7 +65,7 @@
         <!-- 单位是分钟-->
         <mail.valid_time>3</mail.valid_time>
 
-        <report.url>http://localhost:8082</report.url>
+        <report.url>http://172.31.1.122:9010</report.url>
         <!--Redis setting-->
         <redis.key.validtime>120</redis.key.validtime>
         <redis.ip.requesttimes>5</redis.ip.requesttimes>
@@ -85,13 +85,50 @@
       <id>preview</id>
       <properties>
         <label>dev</label>
-        <datasource.url>jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/trackingio_preview?characterEncoding=utf-8</datasource.url>
-        <datasource.username>trackingio</datasource.username>
-        <datasource.password>trackingio</datasource.password>
+        <!--数据源配置-->
         <datasource.driver>com.mysql.jdbc.Driver</datasource.driver>
+        <!--//office-->
+        <datasource.url>jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/manager_preview?characterEncoding=utf-8</datasource.url>
+        <datasource.username>reyuntest</datasource.username>
+        <datasource.password>reyuntest</datasource.password>
+
+        <office.url>jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8</office.url>
+        <office.username>reyuntest</office.username>
+        <office.password>reyuntest</office.password>
+
+        <tkio.url>jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/trackingio_test?characterEncoding=utf-8</tkio.url>
+        <tkio.username>reyuntest</tkio.username>
+        <tkio.password>reyuntest</tkio.password>
+
+        <track.url>jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/track_test?characterEncoding=utf-8</track.url>
+        <track.username>reyuntest</track.username>
+        <track.password>reyuntest</track.password>
+
+        <dmp.url>jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/manager_preview?characterEncoding=utf-8</dmp.url>
+        <dmp.username>reyuntest</dmp.username>
+        <dmp.password>reyuntest</dmp.password>
+
+        <mail.host>smtp.exmail.qq.com</mail.host>
+        <mail.username>service1@reyun.com</mail.username>
+        <mail.password>XSW29ijn</mail.password>
+        <mail.content_type>text/plain;charset\=GBK</mail.content_type>
+        <mail.list>zhangliang</mail.list>
+        <!-- 单位是分钟-->
+        <mail.valid_time>3</mail.valid_time>
 
         <report.url>http://172.31.1.122:9010</report.url>
+        <!--Redis setting-->
+        <redis.key.validtime>120</redis.key.validtime>
+        <redis.ip.requesttimes>5</redis.ip.requesttimes>
+        <redis.ip.unknown.requesttimes>5</redis.ip.unknown.requesttimes>
+
+        <redis.surl.host>172.31.23.181</redis.surl.host>
+        <redis.surl.port>6379</redis.surl.port>
 
+        <redis.event.host>172.31.23.181</redis.event.host>
+        <redis.event.port>6379</redis.event.port>
+        <redis.event.database>13</redis.event.database>
+        <!--Redis setting//end-->
       </properties>
     </profile>
 
@@ -759,7 +796,7 @@
         <version>${maven.jetty.version}</version>
         <configuration>
           <httpConnector>
-            <port>8091</port>
+            <port>8080</port>
           </httpConnector>
           <webAppConfig>
             <defaultsDescriptor>src/main/resources/webdefault.xml</defaultsDescriptor>

src/main/java/common/repository/Account4WebRepository.java

@@ -18,4 +18,7 @@ public interface Account4WebRepository extends JpaRepository<Account4Web, Long>
     @Query(value = "SELECT * from account4web where past_date = ?1", nativeQuery = true)
     List<Account4Web> findByPast(String yesterday);
 
+    @Query(value = "SELECT * from account4web where status = '已过期'", nativeQuery = true)
+    List<Account4Web> findPast();
+
 }

src/main/java/common/repository/ReminderRepository.java

@@ -17,4 +17,7 @@ public interface ReminderRepository extends JpaRepository<Reminder, Long> {
 
     @Query(value = "SELECT * from reminder where id in (select max(id) from reminder where platform = ?1 group by account_id )", nativeQuery = true)
     List<Reminder> findAllDistinct(String platform);
+
+    @Query(value = "SELECT * from reminder where id in (select max(id) from reminder where platform = ?1 group by account_id ) and status = false", nativeQuery = true)
+    List<Reminder> findAllDistinctFalse(String platform);
 }

src/main/java/common/service/impl/UserServiceImpl.java

@@ -54,6 +54,11 @@ public class UserServiceImpl implements UserService {
         resource.setStatus(true);
         User save = userRepository.save(resource);
 
+        if(resource.getRole().equals(RoleEnum.BUSSINUSS.getKey())){
+
+        }
+
+
         //auth
         Auth auth = new Auth();
         auth.setCreateTime(new Date());

src/main/java/dic/RoleEnum.java

@@ -7,10 +7,7 @@ package dic;
 public enum RoleEnum {
 
     MANAGER(1L,"管理员"),
-    SUB_APP_MANAGER(2L,"子应用管理员"),
-    CUSTOM_AUTH(3L,"自定义权限"),
-    CUSTOM_ROLE(4L,"自定义角色"),
-    CHANNEL_PERSON(5L,"渠道账号");
+    BUSSINUSS(2L,"商务");
 
     private Long key;
     private String value;

src/main/java/tkio/task/SendEmailTask.java

+package tkio.task;
+
+import com.google.api.client.util.ArrayMap;
+import common.model.Account4Web;
+import common.model.Reminder;
+import common.model.User;
+import common.repository.Account4WebRepository;
+import common.repository.ReminderRepository;
+import common.repository.UserRepository;
+import dic.RoleEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import tkio.model.Account;
+import tkio.model.AccountRestrict4Web;
+import tkio.model.PackageType;
+import tkio.model.SalesManLeader;
+import tkio.repository.AccountRepository;
+import tkio.repository.PackageTypeRepository;
+import tkio.repository.SalesManLeaderRepository;
+import tkio.service.AccountFlowRestrictService;
+import util.DateUtil;
+import util.ValidateUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by mxq on 2017/12/25.
+ */
+public class SendEmailTask {
+
+
+    @Autowired
+    Account4WebRepository account4WebRepository;
+
+    @Autowired
+    SalesManLeaderRepository salesManLeaderRepository;
+
+    @Autowired
+    UserRepository userRepository;
+    @Autowired
+    ReminderRepository reminderRepository;
+
+    public void task(){
+        //清空前一天数据
+        List<Account4Web> account4WebList = account4WebRepository.findPast();
+        if(ValidateUtil.isValid(account4WebList)){
+            Map<Long, List<String>> map = new HashMap<>();
+            for(Account4Web aw : account4WebList){
+                if(map.containsKey(0L)){
+                    List<String> list = map.get(0L);
+                    list.add(aw.getEmail());
+                    map.put(aw.getBussinessMan(), list);
+                } else {
+                    List<String> list = new ArrayList<>();
+                    list.add(aw.getEmail());
+                    map.put(0L, list);
+                }
+                if(null != aw.getBussinessMan()){
+                    if(map.containsKey(aw.getBussinessMan())){
+                        List<String> list = map.get(aw.getBussinessMan());
+                        list.add(aw.getEmail());
+                        map.put(aw.getBussinessMan(), list);
+                    } else {
+                        List<String> list = new ArrayList<>();
+                        list.add(aw.getEmail());
+                        map.put(aw.getBussinessMan(), list);
+                    }
+                }
+            }
+
+            List<SalesManLeader> salesManLeaders = salesManLeaderRepository.findAll();
+            Map<String, List<Long>> saleMap = new HashMap<>();
+            if(ValidateUtil.isValid(salesManLeaders)){
+                for(SalesManLeader sml : salesManLeaders){
+                    List<Long> idList = new ArrayList<>();
+                    if(sml.getId() == 0 || sml.getId() == sml.getLeader()){//不是主管
+                        Long id = (long)sml.getId();
+                        idList.add(id);
+                    }else{//是主管
+                        for(SalesManLeader sml2 : salesManLeaders){
+                            if(sml.getId() == sml2.getLeader()){
+                                Long id = (long)sml.getId();
+                                idList.add(id);
+                            }
+                        }
+                    }
+                    saleMap.put(sml.getEmail(), idList);
+                }
+            }
+            List<Reminder> reminderList = reminderRepository.findAllDistinctFalse("tkio");
+            Map<String, Boolean> reMap = new HashMap<>();
+            if(ValidateUtil.isValid(reminderList)){
+                for(Reminder re : reminderList){
+                    reMap.put(re.getEmail(), re.getRemindStatus());
+                }
+            }
+            List<User> userList = userRepository.findAll();
+            for(User user : userList){
+                if(user.getRole().equals(RoleEnum.MANAGER.getKey())){
+                    List<String> list = map.get(0L);
+                    List<String> newList = new ArrayList<>();
+                    for(String em : list){
+                        if (reMap.containsKey(em)){
+                            if(reMap.get(em)){
+                                newList.add(em);
+                            }else{
+                                newList.add(em);
+                            }
+                        }
+                    }
+                    //sendEmail
+
+                } else if(saleMap.containsKey(user.getId())){
+                    List<Long> idlist = saleMap.get(user.getId());
+                    List<String> newList = new ArrayList<>();
+                    for(Long id : idlist){
+                        if(map.containsKey(id)){
+                            List<String> list = map.get(id);
+                            for(String em : list){
+                                if (reMap.containsKey(em)){
+                                    if(reMap.get(em)){
+                                        newList.add(em);
+                                    }else{
+                                        newList.add(em);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    //sendEmail
+
+                }
+            }
+        }
+
+    }
+}

src/main/webapp/index.jsp

-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>

target/classes/common.properties

-report.url=http://localhost:8082
+report.url=http://172.31.1.122:9010
 awsneed=${awsneed}
 profile.table=${profile.table}
 event.table=${event.table}

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -130,3 +130,4 @@ tkio\model\IsNotified.class
 track\task\AccountTask.class
 tkio\model\Auth.class
 dmp\model\OtPkgDevStats.class
+tkio\task\SendEmailTask.class