bvn13
/
JIrcBot
mirror of https://github.com/bvn13/JIrcBot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

implemented logs view as html

pull/2/head
Vyacheslav N. Boyko 2018-03-10 23:07:14 +03:00
parent da1cacd209
commit af8fb07d7e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jircbot.service
View File

@ -5,7 +5,7 @@ After=network.target
[Service]
User=bvn13
WorkingDirectory=/srv/jircbot
ExecStart=/usr/bin/java -jar /srv/jircbot/jircbot-1.1.5.jar
ExecStart=/usr/bin/java -jar /srv/jircbot/jircbot-1.1.6.jar
SuccessExitStatus=143
[Install]

2
src/main/java/ru/bvn13/jircbot/database/entities/dto/BaseDTO.java
View File

@ -13,7 +13,7 @@ import java.util.Date;
@Setter
public abstract class BaseDTO {
private final SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
private final SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
private Long id;
private Date dtCreated;

2
src/main/java/ru/bvn13/jircbot/database/repositories/IrcMessageRepository.java
View File

@ -16,7 +16,7 @@ public interface IrcMessageRepository extends JpaRepository<IrcMessage, Long> {
List<IrcMessage> findAllByServerHostAndChannelNameAndDtCreatedGreaterThanEqualAndDtCreatedIsLessThanEqual(String serverHost, String channelName, Date dtFrom, Date dtTo);
//@Query("SELECT m FROM IrcMessage m WHERE m.serverHost = :serverHost AND m.channelName SIMILAR TO CONCAT('\\#+', :channelName) AND m.dtCreated >= :dtFrom AND m.dtCreated <= :dtTo")
@Query("SELECT m FROM IrcMessage m WHERE m.serverHost = :serverHost AND (m.channelName = CONCAT('#', :channelName) OR m.channelName = CONCAT('##', :channelName)) AND m.dtCreated >= :dtFrom AND m.dtCreated <= :dtTo")
@Query("SELECT m FROM IrcMessage m WHERE m.serverHost = :serverHost AND (m.channelName = CONCAT('#', :channelName) OR m.channelName = CONCAT('##', :channelName)) AND m.dtCreated >= :dtFrom AND m.dtCreated <= :dtTo ORDER BY m.dtCreated")
List<IrcMessage> findAllByServerHostAndChannelNameAndDay(@Param("serverHost") String serverHost, @Param("channelName") String channelName, @Param("dtFrom") Date dtFrom, @Param("dtTo") Date dtTo);
}

2
src/main/java/ru/bvn13/jircbot/web/controllers/IrcLogController.java
View File

@ -26,7 +26,7 @@ import java.util.List;
public class IrcLogController {
private final SimpleDateFormat DATE_READER = new SimpleDateFormat("yyyy-MM-dd");
private final SimpleDateFormat DATE_WRITER = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
private final SimpleDateFormat DATE_WRITER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Autowired
private IrcMessageService ircMessageService;