From daa29b37a5bccac0ba4955d5266100014f814a0e Mon Sep 17 00:00:00 2001
From: spark <wzl@huazx.cn>
Date: Tue, 7 Jan 2025 13:29:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(stock):=20=E6=B7=BB=E5=8A=A0=E8=82=A1?=
 =?UTF-8?q?=E7=A5=A8=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD-=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20SetStockSort=20=E5=87=BD=E6=95=B0=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=82=A1=E7=A5=A8=E6=8E=92=E5=BA=8F=20-=20?=
 =?UTF-8?q?=E5=9C=A8=E5=89=8D=E7=AB=AF=E5=A2=9E=E5=8A=A0=E8=82=A1=E7=A5=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=9A=84=E8=BE=93=E5=85=A5=E5=92=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=20-=20=E4=BF=AE=E6=94=B9=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=82=A1=E7=A5=A8=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=20-=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=82=A1=E7=A5=A8=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=EF=BC=8C=E6=94=AF=E6=8C=81=E6=8C=89=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=80=BC=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.go                            |   4 +-
 backend/data/stock_data_api.go    |  19 +++--
 frontend/src/components/stock.vue | 126 +++++++++++++++++++++++-------
 frontend/wailsjs/go/main/App.d.ts |   2 +
 frontend/wailsjs/go/main/App.js   |   4 +
 5 files changed, 121 insertions(+), 34 deletions(-)

diff --git a/app.go b/app.go
index 0fd3776..a9ab9bb 100644
--- a/app.go
+++ b/app.go
@@ -113,7 +113,9 @@ func (a *App) SetCostPriceAndVolume(stockCode string, price float64, volume int6
 func (a *App) SetAlarmChangePercent(val, alarmPrice float64, stockCode string) string {
 	return data.NewStockDataApi().SetAlarmChangePercent(val, alarmPrice, stockCode)
 }
-
+func (a *App) SetStockSort(sort int64, stockCode string) {
+	data.NewStockDataApi().SetStockSort(sort, stockCode)
+}
 func (a *App) SendDingDingMessage(message string, stockCode string) string {
 	ttl, _ := a.cache.TTL([]byte(stockCode))
 	logger.SugaredLogger.Infof("stockCode %s ttl:%d", stockCode, ttl)
diff --git a/backend/data/stock_data_api.go b/backend/data/stock_data_api.go
index 2d11e16..2667e4b 100644
--- a/backend/data/stock_data_api.go
+++ b/backend/data/stock_data_api.go
@@ -287,12 +287,15 @@ func (receiver StockDataApi) Follow(stockCode string) string {
 	}
 	price, _ := convertor.ToFloat(stockInfo.Price)
 	db.Dao.Model(&FollowedStock{}).FirstOrCreate(&FollowedStock{
-		StockCode:     stockCode,
-		Name:          stockInfo.Name,
-		Price:         price,
-		Time:          time.Now(),
-		ChangePercent: 0,
-		PriceChange:   0,
+		StockCode:          stockCode,
+		Name:               stockInfo.Name,
+		Price:              price,
+		Time:               time.Now(),
+		ChangePercent:      0,
+		PriceChange:        0,
+		Sort:               0,
+		AlarmChangePercent: 3,
+		AlarmPrice:         price + 1,
 	}, &FollowedStock{StockCode: stockCode})
 	return "关注成功"
 }
@@ -323,6 +326,10 @@ func (receiver StockDataApi) SetAlarmChangePercent(val, alarmPrice float64, stoc
 	return "设置成功"
 }
 
+func (receiver StockDataApi) SetStockSort(sort int64, stockCode string) {
+	db.Dao.Model(&FollowedStock{}).Where("stock_code = ?", stockCode).Update("sort", sort)
+}
+
 func (receiver StockDataApi) GetFollowList() []FollowedStock {
 	var result []FollowedStock
 	db.Dao.Model(&FollowedStock{}).Order("sort asc,time desc").Find(&result)
diff --git a/frontend/src/components/stock.vue b/frontend/src/components/stock.vue
index 1f76fb5..dede916 100644
--- a/frontend/src/components/stock.vue
+++ b/frontend/src/components/stock.vue
@@ -1,5 +1,5 @@
 <script setup>
-import {onBeforeMount, onBeforeUnmount, onMounted, reactive, ref} from 'vue'
+import {computed, onBeforeMount, onBeforeUnmount, onMounted, reactive, ref} from 'vue'
 import {
   Follow,
   GetFollowList,
@@ -7,11 +7,11 @@ import {
   Greet,
   SendDingDingMessage,
   SetAlarmChangePercent,
-  SetCostPriceAndVolume,
+  SetCostPriceAndVolume, SetStockSort,
   UnFollow
 } from '../../wailsjs/go/main/App'
 import {NButton, NFlex, NForm, NFormItem, NInputNumber, NText, useMessage, useModal} from 'naive-ui'
-import {EventsOn, WindowFullscreen, WindowUnfullscreen} from '../../wailsjs/runtime'
+import {EventsOn, WindowFullscreen, WindowReload, WindowUnfullscreen} from '../../wailsjs/runtime'
 import {Add, Search} from '@vicons/ionicons5'
 
 const message = useMessage()
@@ -34,6 +34,7 @@ const formModel = ref({
   volume: 0,
   alarm: 0,
   alarmPrice:0,
+  sort:999,
 })
 
 const data = reactive({
@@ -45,6 +46,15 @@ const data = reactive({
   fullscreen: false,
 })
 
+const sortedResults = computed(() => {
+  console.log("computed",sortedResults.value)
+  const sortedKeys =Object.keys(results.value).sort();
+  const sortedObject = {};
+  sortedKeys.forEach(key => {
+    sortedObject[key] = results.value[key];
+  });
+  return sortedObject
+});
 
 onBeforeMount(()=>{
   GetStockList("").then(result => {
@@ -95,17 +105,19 @@ EventsOn("showSearch",(data)=>{
 
 
 EventsOn("refreshFollowList",(data)=>{
- message.loading("refresh...")
-  GetFollowList().then(result => {
-    followList.value = result
-    for (const followedStock of result) {
-      if (!stocks.value.includes(followedStock.StockCode)) {
-        stocks.value.push(followedStock.StockCode)
-      }
-    }
-    monitor()
-    message.destroyAll
-  })
+
+  WindowReload()
+ // message.loading("refresh...")
+ //  GetFollowList().then(result => {
+ //    followList.value = result
+ //    for (const followedStock of result) {
+ //      if (!stocks.value.includes(followedStock.StockCode)) {
+ //        stocks.value.push(followedStock.StockCode)
+ //      }
+ //    }
+ //    monitor()
+ //    message.destroyAll
+ //  })
 })
 
 //判断是否是A股交易时间
@@ -142,10 +154,15 @@ function AddStock(){
 
 
 
-function removeMonitor(code,name) {
- // console.log("removeMonitor",name,code)
+function removeMonitor(code,name,key) {
+  console.log("removeMonitor",name,code,key)
   stocks.value.splice(stocks.value.indexOf(code),1)
-  delete results.value[name]
+  console.log("removeMonitor-key",key)
+  console.log("removeMonitor-v",results.value[key])
+
+  delete results.value[key]
+  console.log("removeMonitor-v",results.value[key])
+
   UnFollow(code).then(result => {
     message.success(result)
   })
@@ -205,15 +222,35 @@ async function monitor() {
           result.profitType="success"
         }
         if(result["当前价格"]){
-          if((res[0].AlarmChangePercent>0&&Math.abs(roundedNum)>res[0].AlarmChangePercent)||(res[0].AlarmPrice>0&&result["当前价格"]>res[0].AlarmPrice)){
-            SendMessage(result)
+          if(res[0].AlarmChangePercent>0&&Math.abs(roundedNum)>=res[0].AlarmChangePercent){
+            SendMessage(result,1)
+          }
+
+          if(res[0].AlarmPrice>0&&result["当前价格"]>=res[0].AlarmPrice){
+            SendMessage(result,2)
+          }
+
+          if(res[0].CostPrice>0&&result["当前价格"]>=res[0].CostPrice){
+            SendMessage(result,3)
           }
         }
       }
-      results.value[result["股票名称"]]=result
+      result.key=GetSortKey(result.Sort,result["股票代码"])
+      results.value[GetSortKey(result.Sort,result["股票代码"])]=result
+
     })
   }
 }
+
+//数字长度不够前面补0
+function padZero(num, length) {
+  return (Array(length).join('0') + num).slice(-length);
+}
+
+function GetSortKey(sort,code){
+  return padZero(sort,6)+"_"+code
+}
+
 function onSelect(item) {
   //console.log("onSelect",item)
 
@@ -240,6 +277,7 @@ function setStock(code,name){
     formModel.value.costPrice=res[0].CostPrice
     formModel.value.alarm=res[0].AlarmChangePercent
     formModel.value.alarmPrice=res[0].AlarmPrice
+    formModel.value.sort=res[0].Sort
     modalShow.value=true
 }
 
@@ -258,6 +296,13 @@ function showK(code,name){
 
 
 function updateCostPriceAndVolumeNew(code,price,volume,alarm,formModel){
+
+  if(formModel.sort){
+    SetStockSort(formModel.sort,code).then(result => {
+      //message.success(result)
+    })
+  }
+
   if(alarm||formModel.alarmPrice){
     SetAlarmChangePercent(alarm,formModel.alarmPrice,code).then(result => {
       //message.success(result)
@@ -288,9 +333,12 @@ function fullscreen(){
   data.fullscreen=!data.fullscreen
 }
 
-function SendMessage(result){
+
+//type 报警类型: 1 涨跌报警;2 股价报警 3 成本价报警
+function SendMessage(result,type){
+  let typeName=getTypeName(type)
   let img='http://image.sinajs.cn/newchart/min/n/'+result["股票代码"]+'.gif'+"?t="+Date.now()
-  let markdown="### go-stock市场行情\n\n"+
+  let markdown="### go-stock ["+typeName+"]\n\n"+
       "### "+result["股票名称"]+"("+result["股票代码"]+")\n" +
       "- 当前价格: "+result["当前价格"]+"  "+result.s+"\n" +
       "- 最高价: "+result["今日最高价"]+"  "+result.highRate+"\n" +
@@ -301,10 +349,12 @@ function SendMessage(result){
       "- 成本数量: "+result.volume+"股\n" +
       "- 日期: "+result["日期"]+"  "+result["时间"]+"\n\n"+
       "![image]("+img+")\n"
+  let title=result["股票名称"]+"("+result["股票代码"]+") "+result["当前价格"]+" "+result.s
+
   let msg='{' +
       '     "msgtype": "markdown",' +
       '     "markdown": {' +
-      '         "title":"'+result["股票名称"]+"("+result["股票代码"]+") "+result["当前价格"]+" "+result.s+'",' +
+      '         "title":"['+typeName+"]"+title+'",' +
       '         "text": "'+markdown+'"' +
       '     },' +
       '      "at": {' +
@@ -314,6 +364,19 @@ function SendMessage(result){
     SendDingDingMessage(msg,result["股票代码"])
 }
 
+function getTypeName(type){
+  switch (type)
+  {
+    case 1:
+      return "涨跌报警"
+    case 2:
+      return "股价报警"
+    case 3:
+      return "成本价报警"
+    default:
+      return ""
+  }
+}
 
 //获取高度
 function getHeight() {
@@ -323,8 +386,8 @@ function getHeight() {
 
 <template>
   <n-grid :x-gap="8" :cols="3"  :y-gap="8" >
-      <n-gi v-for="result in results" >
-         <n-card    :data-code="result['股票代码']" :bordered="false" :title="result['股票名称']"   :closable="true" @close="removeMonitor(result['股票代码'],result['股票名称'])">
+      <n-gi v-for="result in sortedResults" >
+         <n-card    :data-code="result['股票代码']" :bordered="false" :title="result['股票名称']"   :closable="true" @close="removeMonitor(result['股票代码'],result['股票名称'],result.key)">
            <n-grid :cols="1" :y-gap="6">
              <n-gi>
                <n-text :type="result.type" >{{result["当前价格"]}}</n-text><n-text style="padding-left: 10px;" :type="result.type">{{ result.s}}</n-text>&nbsp;
@@ -387,7 +450,13 @@ function getHeight() {
 
   </n-affix>
       <n-modal transform-origin="center" size="small" v-model:show="modalShow" :title="formModel.name" style="width: 400px" :preset="'card'">
-            <n-form :model="formModel" :rules="{ costPrice: { required: true, message: '请输入成本'}, volume: { required: true, message: '请输入数量'},alarm:{required: true, message: '涨跌报警值'} }" label-placement="left" label-width="80px">
+            <n-form :model="formModel" :rules="{
+              costPrice: { required: true, message: '请输入成本'},
+              volume: { required: true, message: '请输入数量'},
+              alarm:{required: true, message: '涨跌报警值'} ,
+              alarmPrice: { required: true, message: '请输入报警价格'},
+              sort: { required: true, message: '请输入排序值'},
+            }" label-placement="left" label-width="80px">
               <n-form-item label="股票成本" path="costPrice">
                 <n-input-number v-model:value="formModel.costPrice" min="0"  placeholder="请输入股票成本" >
                   <template #suffix>
@@ -416,7 +485,10 @@ function getHeight() {
                   </template>
                 </n-input-number>
               </n-form-item>
-
+              <n-form-item label="股票排序" path="sort">
+                <n-input-number v-model:value="formModel.sort"  min="0" placeholder="请输入股价排序值" >
+                </n-input-number>
+              </n-form-item>
             </n-form>
             <template #footer>
               <n-button type="primary" @click="updateCostPriceAndVolumeNew(formModel.code,formModel.costPrice,formModel.volume,formModel.alarm,formModel)">保存</n-button>
diff --git a/frontend/wailsjs/go/main/App.d.ts b/frontend/wailsjs/go/main/App.d.ts
index cfc168a..338298f 100644
--- a/frontend/wailsjs/go/main/App.d.ts
+++ b/frontend/wailsjs/go/main/App.d.ts
@@ -16,4 +16,6 @@ export function SetAlarmChangePercent(arg1:number,arg2:number,arg3:string):Promi
 
 export function SetCostPriceAndVolume(arg1:string,arg2:number,arg3:number):Promise<string>;
 
+export function SetStockSort(arg1:number,arg2:string):Promise<void>;
+
 export function UnFollow(arg1:string):Promise<string>;
diff --git a/frontend/wailsjs/go/main/App.js b/frontend/wailsjs/go/main/App.js
index 676fe02..3fe45f9 100644
--- a/frontend/wailsjs/go/main/App.js
+++ b/frontend/wailsjs/go/main/App.js
@@ -30,6 +30,10 @@ export function SetCostPriceAndVolume(arg1, arg2, arg3) {
   return window['go']['main']['App']['SetCostPriceAndVolume'](arg1, arg2, arg3);
 }
 
+export function SetStockSort(arg1, arg2) {
+  return window['go']['main']['App']['SetStockSort'](arg1, arg2);
+}
+
 export function UnFollow(arg1) {
   return window['go']['main']['App']['UnFollow'](arg1);
 }