Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

高山のAuthorを記述 #45

Merged
merged 1 commit into from
Aug 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/com/example/demo/AppConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/example/demo/DemoApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/example/demo/ScheduledTasks.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

/**
* @author Yuta Takayama
*/
@Component
public class ScheduledTasks {

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/example/demo/common/EmologOutput.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
import java.util.ArrayList;
import java.util.List;

/**
* @author Yuta Takayama
*/
public class EmologOutput {

/** text to keyword
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/example/demo/controller/ChatController.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
import org.springframework.stereotype.Controller;

//chatページの表示
/**
* @author Yuta Takayama
*/
@Controller
@RequestMapping(path = "/chat")
public class ChatController {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
import java.util.ArrayList;
import java.util.List;


/**
* @author Yuta Takayama
*/
@Controller
@RequestMapping(path = "/emologlist")
public class EmologController {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -26,7 +28,7 @@ public String selectAll(@PathVariable("userid") String userid, Model model) {
List<Friend> friends = service.selectAll(userId);
model.addAttribute("friends", friends);
return "friendlist.html";
}*/
}

@RequestMapping(path = "/friendlist")
public String chat(Model model) {
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/example/demo/controller/NLUController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

import java.util.List;


/**
* @author Yuta Takayama
* バックエンドのテストのために作成したコード。
* 実際のプロダクトには使用していない。
*/
@RestController
@RequestMapping(path = "/sample")
public class SampleController {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/example/demo/controller/ViewController.java
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ public String convert(
}
}

/**
* @author Yuta Takayama
*/
@RequestMapping(value="/emolog",method=RequestMethod.GET)
public List<Emolog> insertEmolog(
Integer user,
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/example/demo/dao/EmologDao.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
import java.util.HashMap;
import java.util.List;

/**
* @author Yuta Takayama
*/
@Dao
@ConfigAutowireable
public interface EmologDao {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/example/demo/dao/FriendDao.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@

import java.util.List;

/**
* @author Yuta Takayama
*/
@Dao
@ConfigAutowireable
public interface FriendDao {
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/example/demo/entity/Emolog.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
import java.io.Serializable;
import java.time.LocalDateTime;


/**
* @author Yuta Takayama
*/
@Entity
@Data
@Getter
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/example/demo/entity/Friend.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
import java.io.Serializable;
import java.time.LocalDateTime;


/**
* @author Yuta Takayama
*/
@Entity
@Data
@Getter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
import java.util.HashMap;
import java.util.List;

/**
* @author Yuta Takayama
*/
@Repository
public class EmologRepository {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

import java.util.List;

/**
* @author Yuta Takayama
*/
@Repository
public class FriendRepository {

Expand Down
11 changes: 7 additions & 4 deletions src/main/java/com/example/demo/service/EmologService.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
import java.time.LocalDateTime;
import java.util.*;

/**
* @author Yuta Takayama
*/
@Service
public class EmologService {

Expand Down Expand Up @@ -56,16 +59,16 @@ public List<Emolog> insert(int user, int friend, String contents) throws ParseEx
}
//END:nakamura

/**
* @author Yuta Takayama
*/
public void createEmolog() throws Exception {
List<Friend> friends = friendRepository.selectAllRecord();

//TODO ここにEmolog生成処理記述
List<Emolog> newEmologs = new ArrayList<Emolog>();
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());

Expand All @@ -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());
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/example/demo/service/FriendService.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

import java.util.List;

/**
* @author Yuta Takayama
*/
@Service
public class FriendService {

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/example/demo/service/SampleService.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

import java.util.List;

/**
* @author Yuta Takayama
*/
@Service
public class SampleService {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
--/**
--* @author Yuta Takayama
--*/
select *
from emolog
where
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
--/**
--* @author Yuta Takayama
--*/
select *
from emolog
where
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
--/**
--* @author Yuta Takayama
--*/
select *
from emolog
where
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
--/**
--* @author Yuta Takayama
--*/

select *
from friend
where
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
--/**
--* @author Yuta Takayama
--*/
select *
from friend
where userid = /* userid */1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
--/**
--* @author Yuta Takayama
--*/
select *
from friend