1
zj
2024-06-02 6f353ae65e9c9f117a9c1177aa5766fd6a3a161e
1
5 files modified
20 ■■■■ changed files
src/main/java/com/nq/service/impl/TradingHourServiceImpl.java 4 ●●●● patch | view | raw | blame | history
src/main/java/com/nq/utils/timeutil/TimeUtil.java 2 ●●● patch | view | raw | blame | history
target/classes/application.properties 6 ●●●● patch | view | raw | blame | history
target/classes/mapper/UserMapper.xml 3 ●●●●● patch | view | raw | blame | history
target/classes/mapper/UserStockSubscribeMapper.xml 5 ●●●●● patch | view | raw | blame | history
src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
@@ -15,6 +15,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDate;
/**
 * @program: dabao
@@ -55,6 +56,9 @@
        if(stockTimeSetting == null){
            return  false;
        }
        if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
            return false;
        }
        return TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(),stockTimeSetting.getAmEndTime(),stockTimeSetting.getPmStartTime(),stockTimeSetting.getPmEndTime());
    }
src/main/java/com/nq/utils/timeutil/TimeUtil.java
@@ -16,7 +16,7 @@
        }
        if(now.isAfter(pmTime) && now.isBefore(pmTime1)){
        if(now.isAfter(pmTime) || now.isBefore(pmTime1)){
            return true;
        }
        return false;
target/classes/application.properties
@@ -17,7 +17,7 @@
ftp.user=ftp_stock
ftp.pass=123456
ftp.address =/www/wwwroot/ftp_stock/
ftp.server.http.prefix=https://img.marwadi.online/
ftp.server.http.prefix=https://img.essencefunds.com/
redis1.ip=localhost
redis1.port=6379
@@ -45,6 +45,10 @@
IN_WS_URL =ws://ws.is4vc.com:8001/websocket-server
IN_KEY = r3ZAgtcYzuBizmqge2hK
JS_IN_HTTP_API = http://api-in-2-socket.js-stock.top
JS_IN_WS_URL =ws://api-in-2-ws.js-stock.top
JS_IN_KEY = eVKtHt7aG4m6ozwWL9qG
US_HTTP_API = http://api-us.js-stock.top/
US_WS_URL = ws://ws-us.js-stock.top
US_KEY = jZFrku4RGQjP87Hmq5tm
target/classes/mapper/UserMapper.xml
@@ -36,6 +36,9 @@
  </sql>
    <select id="findByPhone" parameterType="string" resultType="com.nq.pojo.User">
        select * from user where phone= #{phone}
    </select>
    <select id="login" resultMap="BaseResultMap" parameterType="map">
        SELECT
target/classes/mapper/UserStockSubscribeMapper.xml
@@ -201,9 +201,8 @@
    </update>
    <select id="load" resultMap="BaseResultMap">
        SELECT <include refid="Base_Column_List" />
        FROM user_stock_subscribe
    <select id="load" resultType="com.nq.pojo.UserStockSubscribe" parameterType="int">
        SELECT * FROM user_stock_subscribe
        WHERE id = #{id}
    </select>