From 307dae259cde8f42639ff9d43b6add1c0c7e4d8b Mon Sep 17 00:00:00 2001 From: Yuta Takayama Date: Sat, 29 Aug 2020 23:32:43 +0900 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=B1=B1=E3=81=AEAuthor=E3=82=92?= =?UTF-8?q?=E8=A8=98=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/AppConfig.java | 3 +++ src/main/java/com/example/demo/DemoApplication.java | 4 +++- src/main/java/com/example/demo/ScheduledTasks.java | 3 +++ .../java/com/example/demo/common/EmologOutput.java | 3 +++ .../com/example/demo/controller/ChatController.java | 3 +++ .../com/example/demo/controller/EmologController.java | 4 +++- .../com/example/demo/controller/FriendController.java | 8 +++++--- .../com/example/demo/controller/NLUController.java | 5 +++++ .../com/example/demo/controller/SampleController.java | 6 +++++- .../com/example/demo/controller/ViewController.java | 3 +++ src/main/java/com/example/demo/dao/EmologDao.java | 3 +++ src/main/java/com/example/demo/dao/FriendDao.java | 3 +++ src/main/java/com/example/demo/entity/Emolog.java | 4 +++- src/main/java/com/example/demo/entity/Friend.java | 4 +++- .../com/example/demo/repository/EmologRepository.java | 3 +++ .../com/example/demo/repository/FriendRepository.java | 3 +++ .../java/com/example/demo/service/EmologService.java | 11 +++++++---- .../java/com/example/demo/service/FriendService.java | 3 +++ .../java/com/example/demo/service/SampleService.java | 3 +++ .../com/example/demo/dao/EmologDao/selectAll.sql | 3 +++ .../com/example/demo/dao/EmologDao/selectByDay.sql | 3 +++ .../com/example/demo/dao/EmologDao/selectById.sql | 3 +++ .../com/example/demo/dao/FriendDao/select.sql | 4 ++++ .../com/example/demo/dao/FriendDao/selectAll.sql | 3 +++ .../example/demo/dao/FriendDao/selectAllRecord.sql | 3 +++ 25 files changed, 86 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/example/demo/AppConfig.java b/src/main/java/com/example/demo/AppConfig.java index f35bd8b..cb8dc9c 100644 --- a/src/main/java/com/example/demo/AppConfig.java +++ b/src/main/java/com/example/demo/AppConfig.java @@ -10,6 +10,9 @@ import org.seasar.doma.jdbc.tx.LocalTransactionManager; import org.seasar.doma.jdbc.tx.TransactionManager; +/** + * @author Yuta Takayama + */ @SingletonConfig public class AppConfig implements Config { diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java index ada53fc..0bbb6c7 100644 --- a/src/main/java/com/example/demo/DemoApplication.java +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -8,7 +8,9 @@ import org.springframework.scheduling.annotation.EnableScheduling; -//public class DemoApplication implements CommandLineRunner { +/** + * @author Yuta Takayama + */ @SpringBootApplication @EnableScheduling public class DemoApplication implements CommandLineRunner { diff --git a/src/main/java/com/example/demo/ScheduledTasks.java b/src/main/java/com/example/demo/ScheduledTasks.java index 87db0b9..78a85b2 100644 --- a/src/main/java/com/example/demo/ScheduledTasks.java +++ b/src/main/java/com/example/demo/ScheduledTasks.java @@ -11,6 +11,9 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +/** + * @author Yuta Takayama + */ @Component public class ScheduledTasks { diff --git a/src/main/java/com/example/demo/common/EmologOutput.java b/src/main/java/com/example/demo/common/EmologOutput.java index c993e90..7d5de15 100644 --- a/src/main/java/com/example/demo/common/EmologOutput.java +++ b/src/main/java/com/example/demo/common/EmologOutput.java @@ -14,6 +14,9 @@ import java.util.ArrayList; import java.util.List; +/** +* @author Yuta Takayama +*/ public class EmologOutput { /** text to keyword diff --git a/src/main/java/com/example/demo/controller/ChatController.java b/src/main/java/com/example/demo/controller/ChatController.java index 0d5e844..f93bace 100644 --- a/src/main/java/com/example/demo/controller/ChatController.java +++ b/src/main/java/com/example/demo/controller/ChatController.java @@ -21,6 +21,9 @@ import org.springframework.stereotype.Controller; //chatページの表示 +/** + * @author Yuta Takayama + */ @Controller @RequestMapping(path = "/chat") public class ChatController { diff --git a/src/main/java/com/example/demo/controller/EmologController.java b/src/main/java/com/example/demo/controller/EmologController.java index 833de52..5760aa6 100644 --- a/src/main/java/com/example/demo/controller/EmologController.java +++ b/src/main/java/com/example/demo/controller/EmologController.java @@ -17,7 +17,9 @@ import java.util.ArrayList; import java.util.List; - +/** + * @author Yuta Takayama + */ @Controller @RequestMapping(path = "/emologlist") public class EmologController { diff --git a/src/main/java/com/example/demo/controller/FriendController.java b/src/main/java/com/example/demo/controller/FriendController.java index a78ef85..be19e7d 100644 --- a/src/main/java/com/example/demo/controller/FriendController.java +++ b/src/main/java/com/example/demo/controller/FriendController.java @@ -12,12 +12,14 @@ import java.util.List; - +/** + * @author Yuta Takayama + */ @Controller @RequestMapping(path = "/") public class FriendController { - /*@Autowired + @Autowired FriendService service; @RequestMapping(value="/{userid}",method=RequestMethod.GET) @@ -26,7 +28,7 @@ public String selectAll(@PathVariable("userid") String userid, Model model) { List friends = service.selectAll(userId); model.addAttribute("friends", friends); return "friendlist.html"; - }*/ + } @RequestMapping(path = "/friendlist") public String chat(Model model) { diff --git a/src/main/java/com/example/demo/controller/NLUController.java b/src/main/java/com/example/demo/controller/NLUController.java index 8663a20..c016886 100644 --- a/src/main/java/com/example/demo/controller/NLUController.java +++ b/src/main/java/com/example/demo/controller/NLUController.java @@ -15,6 +15,11 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestMethod; +/** + * @author Yuta Takayama + * 自然言語認識のテストのために作成したコード。 + * 実際のプロダクトには使用していない。 + */ @RestController @RequestMapping(path = "/NLU") public class NLUController { diff --git a/src/main/java/com/example/demo/controller/SampleController.java b/src/main/java/com/example/demo/controller/SampleController.java index a4aeda1..acd8edb 100644 --- a/src/main/java/com/example/demo/controller/SampleController.java +++ b/src/main/java/com/example/demo/controller/SampleController.java @@ -10,7 +10,11 @@ import java.util.List; - +/** + * @author Yuta Takayama + * バックエンドのテストのために作成したコード。 + * 実際のプロダクトには使用していない。 + */ @RestController @RequestMapping(path = "/sample") public class SampleController { diff --git a/src/main/java/com/example/demo/controller/ViewController.java b/src/main/java/com/example/demo/controller/ViewController.java index 4916069..ff49e6b 100644 --- a/src/main/java/com/example/demo/controller/ViewController.java +++ b/src/main/java/com/example/demo/controller/ViewController.java @@ -196,6 +196,9 @@ public String convert( } } + /** + * @author Yuta Takayama + */ @RequestMapping(value="/emolog",method=RequestMethod.GET) public List insertEmolog( Integer user, diff --git a/src/main/java/com/example/demo/dao/EmologDao.java b/src/main/java/com/example/demo/dao/EmologDao.java index 50ba857..c911921 100644 --- a/src/main/java/com/example/demo/dao/EmologDao.java +++ b/src/main/java/com/example/demo/dao/EmologDao.java @@ -13,6 +13,9 @@ import java.util.HashMap; import java.util.List; +/** + * @author Yuta Takayama + */ @Dao @ConfigAutowireable public interface EmologDao { diff --git a/src/main/java/com/example/demo/dao/FriendDao.java b/src/main/java/com/example/demo/dao/FriendDao.java index 5df8d9e..f43b1d4 100644 --- a/src/main/java/com/example/demo/dao/FriendDao.java +++ b/src/main/java/com/example/demo/dao/FriendDao.java @@ -10,6 +10,9 @@ import java.util.List; +/** + * @author Yuta Takayama + */ @Dao @ConfigAutowireable public interface FriendDao { diff --git a/src/main/java/com/example/demo/entity/Emolog.java b/src/main/java/com/example/demo/entity/Emolog.java index f5a1440..2903924 100644 --- a/src/main/java/com/example/demo/entity/Emolog.java +++ b/src/main/java/com/example/demo/entity/Emolog.java @@ -13,7 +13,9 @@ import java.io.Serializable; import java.time.LocalDateTime; - +/** + * @author Yuta Takayama + */ @Entity @Data @Getter diff --git a/src/main/java/com/example/demo/entity/Friend.java b/src/main/java/com/example/demo/entity/Friend.java index f94963a..4c1f414 100644 --- a/src/main/java/com/example/demo/entity/Friend.java +++ b/src/main/java/com/example/demo/entity/Friend.java @@ -13,7 +13,9 @@ import java.io.Serializable; import java.time.LocalDateTime; - +/** + * @author Yuta Takayama + */ @Entity @Data @Getter diff --git a/src/main/java/com/example/demo/repository/EmologRepository.java b/src/main/java/com/example/demo/repository/EmologRepository.java index 1374e85..6e4782a 100644 --- a/src/main/java/com/example/demo/repository/EmologRepository.java +++ b/src/main/java/com/example/demo/repository/EmologRepository.java @@ -13,6 +13,9 @@ import java.util.HashMap; import java.util.List; +/** + * @author Yuta Takayama + */ @Repository public class EmologRepository { diff --git a/src/main/java/com/example/demo/repository/FriendRepository.java b/src/main/java/com/example/demo/repository/FriendRepository.java index d21099d..37da9d4 100644 --- a/src/main/java/com/example/demo/repository/FriendRepository.java +++ b/src/main/java/com/example/demo/repository/FriendRepository.java @@ -8,6 +8,9 @@ import java.util.List; +/** + * @author Yuta Takayama + */ @Repository public class FriendRepository { diff --git a/src/main/java/com/example/demo/service/EmologService.java b/src/main/java/com/example/demo/service/EmologService.java index bda7e8c..0947276 100644 --- a/src/main/java/com/example/demo/service/EmologService.java +++ b/src/main/java/com/example/demo/service/EmologService.java @@ -17,6 +17,9 @@ import java.time.LocalDateTime; import java.util.*; +/** + * @author Yuta Takayama + */ @Service public class EmologService { @@ -56,16 +59,16 @@ public List insert(int user, int friend, String contents) throws ParseEx } //END:nakamura + /** + * @author Yuta Takayama + */ public void createEmolog() throws Exception { List friends = friendRepository.selectAllRecord(); - //TODO　ここにEmolog生成処理記述 List newEmologs = new ArrayList(); LocalDateTime created_at = LocalDateTime.now(); int count = 0; for (Friend friend : friends) { - // - //TODO: 「取得した最新のtweet_idを保存して次のバッチ処理ではそのtweet_id以降を取得」って処理がまだ出来てない。 try { QueryResult result = emologOutput.querySearch(friend.getName(), friend.getLasttweetid()); @@ -84,7 +87,7 @@ public void createEmolog() throws Exception { ////////// friend.setLatestemolog(emologStr); friend.setUpdated_at(created_at); - friend.setLasttweetid((int)result.getMaxId()); + friend.setLasttweetid(result.getMaxId()); Emolog e = new Emolog(); e.setContents(emologStr); e.setFriendid(friend.getId()); diff --git a/src/main/java/com/example/demo/service/FriendService.java b/src/main/java/com/example/demo/service/FriendService.java index d7c127f..7df9670 100644 --- a/src/main/java/com/example/demo/service/FriendService.java +++ b/src/main/java/com/example/demo/service/FriendService.java @@ -7,6 +7,9 @@ import java.util.List; +/** + * @author Yuta Takayama + */ @Service public class FriendService { diff --git a/src/main/java/com/example/demo/service/SampleService.java b/src/main/java/com/example/demo/service/SampleService.java index 340578d..33debf1 100644 --- a/src/main/java/com/example/demo/service/SampleService.java +++ b/src/main/java/com/example/demo/service/SampleService.java @@ -9,6 +9,9 @@ import java.util.List; +/** + * @author Yuta Takayama + */ @Service public class SampleService { diff --git a/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectAll.sql b/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectAll.sql index 7d1fd64..0753c67 100644 --- a/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectAll.sql +++ b/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectAll.sql @@ -1,3 +1,6 @@ +--/** +--* @author Yuta Takayama +--*/ select * from emolog where diff --git a/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectByDay.sql b/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectByDay.sql index c0d6a66..5ff952d 100644 --- a/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectByDay.sql +++ b/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectByDay.sql @@ -1,3 +1,6 @@ +--/** +--* @author Yuta Takayama +--*/ select * from emolog where diff --git a/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectById.sql b/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectById.sql index 8e6a8d6..26d01b5 100644 --- a/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectById.sql +++ b/src/main/resources/META-INF/com/example/demo/dao/EmologDao/selectById.sql @@ -1,3 +1,6 @@ +--/** +--* @author Yuta Takayama +--*/ select * from emolog where diff --git a/src/main/resources/META-INF/com/example/demo/dao/FriendDao/select.sql b/src/main/resources/META-INF/com/example/demo/dao/FriendDao/select.sql index 248b714..ae7e613 100644 --- a/src/main/resources/META-INF/com/example/demo/dao/FriendDao/select.sql +++ b/src/main/resources/META-INF/com/example/demo/dao/FriendDao/select.sql @@ -1,3 +1,7 @@ +--/** +--* @author Yuta Takayama +--*/ + select * from friend where diff --git a/src/main/resources/META-INF/com/example/demo/dao/FriendDao/selectAll.sql b/src/main/resources/META-INF/com/example/demo/dao/FriendDao/selectAll.sql index e1ab80d..075aac0 100644 --- a/src/main/resources/META-INF/com/example/demo/dao/FriendDao/selectAll.sql +++ b/src/main/resources/META-INF/com/example/demo/dao/FriendDao/selectAll.sql @@ -1,3 +1,6 @@ +--/** +--* @author Yuta Takayama +--*/ select * from friend where userid = /* userid */1 diff --git a/src/main/resources/META-INF/com/example/demo/dao/FriendDao/selectAllRecord.sql b/src/main/resources/META-INF/com/example/demo/dao/FriendDao/selectAllRecord.sql index 710ea0f..4cb574e 100644 --- a/src/main/resources/META-INF/com/example/demo/dao/FriendDao/selectAllRecord.sql +++ b/src/main/resources/META-INF/com/example/demo/dao/FriendDao/selectAllRecord.sql @@ -1,2 +1,5 @@ +--/** +--* @author Yuta Takayama +--*/ select * from friend \ No newline at end of file