Bladeren bron

微网站

xiaoming_global 5 jaren geleden
bovenliggende
commit
278a28caaf

+ 139 - 116
.idea/workspace.xml Bestand weergeven

@@ -3,7 +3,15 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="b2adb873-ba08-458c-9357-4c6584e112eb" name="Default" comment="">
5 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/conf/app.conf" beforeDir="false" afterPath="$PROJECT_DIR$/conf/app.conf" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/controllers/micro/micro_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/micro/micro_controller.go" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/controllers/site/site_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/site/site_controller.go" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/main.go" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/models/activity_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/activity_models.go" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/models/article_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/article_models.go" afterDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/models/site_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/site_models.go" afterDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/routers/router.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/router.go" afterDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/service/micro_service/micro_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/micro_service/micro_service.go" afterDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" afterDir="false" />
7 15
     </list>
8 16
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 17
     <option name="TRACKING_ENABLED" value="true" />
@@ -23,29 +31,41 @@
23 31
           </provider>
24 32
         </entry>
25 33
       </file>
26
-      <file leaf-file-name="micro_controller.go" pinned="false" current-in-tab="true">
27
-        <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
34
+      <file leaf-file-name="micro_service.go" pinned="false" current-in-tab="true">
35
+        <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
28 36
           <provider selected="true" editor-type-id="text-editor">
29
-            <state relative-caret-position="27">
30
-              <caret line="42" column="33" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="33" />
37
+            <state relative-caret-position="82">
38
+              <caret line="15" column="117" selection-start-line="15" selection-start-column="117" selection-end-line="15" selection-end-column="117" />
39
+              <folding>
40
+                <element signature="e#23#71#0" expanded="true" />
41
+              </folding>
31 42
             </state>
32 43
           </provider>
33 44
         </entry>
34 45
       </file>
35
-      <file leaf-file-name="micro_service.go" pinned="false" current-in-tab="false">
36
-        <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
46
+      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
47
+        <entry file="file://$PROJECT_DIR$/routers/router.go">
37 48
           <provider selected="true" editor-type-id="text-editor">
38
-            <state relative-caret-position="1386">
39
-              <caret line="67" column="5" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" />
49
+            <state relative-caret-position="132">
50
+              <caret line="24" column="203" selection-start-line="24" selection-start-column="203" selection-end-line="24" selection-end-column="203" />
40 51
             </state>
41 52
           </provider>
42 53
         </entry>
43 54
       </file>
44
-      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
45
-        <entry file="file://$PROJECT_DIR$/routers/router.go">
55
+      <file leaf-file-name="site_models.go" pinned="false" current-in-tab="false">
56
+        <entry file="file://$PROJECT_DIR$/models/site_models.go">
57
+          <provider selected="true" editor-type-id="text-editor">
58
+            <state relative-caret-position="22">
59
+              <caret line="127" column="45" selection-start-line="127" selection-start-column="45" selection-end-line="127" selection-end-column="45" />
60
+            </state>
61
+          </provider>
62
+        </entry>
63
+      </file>
64
+      <file leaf-file-name="site_microwebsite_service.go" pinned="false" current-in-tab="false">
65
+        <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
46 66
           <provider selected="true" editor-type-id="text-editor">
47
-            <state relative-caret-position="528">
48
-              <caret line="42" column="27" selection-start-line="42" selection-start-column="27" selection-end-line="42" selection-end-column="27" />
67
+            <state relative-caret-position="220">
68
+              <caret line="19" selection-start-line="19" selection-end-line="19" />
49 69
             </state>
50 70
           </provider>
51 71
         </entry>
@@ -53,8 +73,8 @@
53 73
       <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="false">
54 74
         <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
55 75
           <provider selected="true" editor-type-id="text-editor">
56
-            <state relative-caret-position="186">
57
-              <caret line="3890" selection-start-line="3890" selection-end-line="3890" />
76
+            <state relative-caret-position="-984">
77
+              <caret line="3211" column="37" selection-start-line="3211" selection-start-column="26" selection-end-line="3211" selection-end-column="37" />
58 78
               <folding>
59 79
                 <element signature="e#14#224#0" expanded="true" />
60 80
               </folding>
@@ -62,23 +82,20 @@
62 82
           </provider>
63 83
         </entry>
64 84
       </file>
65
-      <file leaf-file-name="site_models.go" pinned="false" current-in-tab="false">
66
-        <entry file="file://$PROJECT_DIR$/models/site_models.go">
85
+      <file leaf-file-name="article_controller.go" pinned="false" current-in-tab="false">
86
+        <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
67 87
           <provider selected="true" editor-type-id="text-editor">
68
-            <state relative-caret-position="1254">
69
-              <caret line="57" column="6" selection-start-line="57" selection-start-column="6" selection-end-line="57" selection-end-column="6" />
88
+            <state relative-caret-position="6578">
89
+              <caret line="311" column="58" selection-start-line="311" selection-start-column="47" selection-end-line="311" selection-end-column="58" />
70 90
             </state>
71 91
           </provider>
72 92
         </entry>
73 93
       </file>
74
-      <file leaf-file-name="site_microwebsite_service.go" pinned="false" current-in-tab="false">
75
-        <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
94
+      <file leaf-file-name="article_category_service.go" pinned="false" current-in-tab="false">
95
+        <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
76 96
           <provider selected="true" editor-type-id="text-editor">
77
-            <state relative-caret-position="159">
78
-              <caret line="259" column="70" selection-start-line="259" selection-start-column="49" selection-end-line="259" selection-end-column="70" />
79
-              <folding>
80
-                <element signature="e#22#104#0" expanded="true" />
81
-              </folding>
97
+            <state relative-caret-position="1078">
98
+              <caret line="55" column="53" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="53" />
82 99
             </state>
83 100
           </provider>
84 101
         </entry>
@@ -94,36 +111,36 @@
94 111
   </component>
95 112
   <component name="FindInProjectRecents">
96 113
     <findStrings>
97
-      <find>GetData</find>
98
-      <find>UpdateditnavigationLink</find>
99
-      <find>SaveNavigation</find>
100
-      <find>AddNavigationLinkform</find>
101
-      <find>AddNavigation</find>
102
-      <find>GetNavgationLinkById</find>
103
-      <find>UpdateEditMacForm</find>
104
-      <find>Deletemodlebyid</find>
105
-      <find>/api/site/updateeditmacform</find>
106
-      <find>UpdateLinkAddress</find>
107
-      <find>GetDatatwo</find>
108
-      <find>UpdatedRolinkAddress</find>
109
-      <find>GetLinkAddressDetail</find>
110
-      <find>UpdatePicFformThree</find>
111
-      <find>AddPicLinkAddress</find>
112
-      <find>AddData</find>
113
-      <find>GetRotationVisibleByLinkId</find>
114
-      <find>GetOrgTitle</find>
115
-      <find>GetReplyAllComents</find>
116
-      <find>CreateArticle</find>
117
-      <find>Addvido</find>
118
-      <find>UpdateVidoInfo</find>
114
+      <find>for</find>
119 115
       <find>GetCountImages</find>
120
-      <find>Getlinkaddress</find>
121
-      <find>AddMagicNavi</find>
122
-      <find>/api/site/deletemodle</find>
123
-      <find>DeleteModle</find>
124
-      <find>/api/site/addeditpicform</find>
125
-      <find>AddEditPicForm</find>
126
-      <find>GetDataByOrgId</find>
116
+      <find>GetNavigationData</find>
117
+      <find>GetData</find>
118
+      <find>GetAritclesData</find>
119
+      <find>GetArititys</find>
120
+      <find>AddActivity</find>
121
+      <find>AddActivitys</find>
122
+      <find>AddArticelist</find>
123
+      <find>AddRotationpic</find>
124
+      <find>GetOrderModel</find>
125
+      <find>GetContactUsModel</find>
126
+      <find>AddConnection</find>
127
+      <find>SaveArticeDetail</find>
128
+      <find>GetArticlistDetail</find>
129
+      <find>AddConnetion</find>
130
+      <find>GetArticlelist</find>
131
+      <find>AddMagicLinkDataTwo</find>
132
+      <find>/api/site/addmagiclinkdata</find>
133
+      <find>Linkaddress</find>
134
+      <find>formatInt</find>
135
+      <find>GetPatienModelByModelId</find>
136
+      <find>AddMagiclinkData</find>
137
+      <find>GetCategorys</find>
138
+      <find>/api/acticle/getCategorys</find>
139
+      <find>AddCategory</find>
140
+      <find>7</find>
141
+      <find>SgjPatientArticlelist</find>
142
+      <find>医院动态</find>
143
+      <find>Saveactivit</find>
127 144
     </findStrings>
128 145
   </component>
129 146
   <component name="GOROOT" path="C:\Go" />
@@ -145,18 +162,19 @@
145 162
         <option value="$PROJECT_DIR$/controllers/members/members_controller.go" />
146 163
         <option value="$PROJECT_DIR$/models/user_customer_models.go" />
147 164
         <option value="$PROJECT_DIR$/service/member_service/member_service.go" />
148
-        <option value="$PROJECT_DIR$/routers/router.go" />
149 165
         <option value="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" />
150 166
         <option value="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" />
151
-        <option value="$PROJECT_DIR$/models/activity_models.go" />
152
-        <option value="$PROJECT_DIR$/models/article_models.go" />
153
-        <option value="$PROJECT_DIR$/models/site_models.go" />
154
-        <option value="$PROJECT_DIR$/service/micro_service/micro_service.go" />
155
-        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
156 167
         <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
157 168
         <option value="$PROJECT_DIR$/controllers/article/article_controller.go" />
169
+        <option value="$PROJECT_DIR$/routers/router.go" />
170
+        <option value="$PROJECT_DIR$/main.go" />
171
+        <option value="$PROJECT_DIR$/models/activity_models.go" />
172
+        <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
173
+        <option value="$PROJECT_DIR$/models/site_models.go" />
174
+        <option value="$PROJECT_DIR$/models/article_models.go" />
158 175
         <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
159 176
         <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
177
+        <option value="$PROJECT_DIR$/service/micro_service/micro_service.go" />
160 178
         <option value="$PROJECT_DIR$/conf/app.conf" />
161 179
       </list>
162 180
     </option>
@@ -168,17 +186,16 @@
168 186
     <sorting>DEFINITION_ORDER</sorting>
169 187
   </component>
170 188
   <component name="ProjectFrameBounds" extendedState="6">
171
-    <option name="x" value="350" />
172
-    <option name="y" value="285" />
173
-    <option name="width" value="1230" />
174
-    <option name="height" value="1040" />
189
+    <option name="x" value="-10" />
190
+    <option name="y" value="-10" />
191
+    <option name="width" value="1785" />
192
+    <option name="height" value="615" />
175 193
   </component>
176 194
   <component name="ProjectView">
177 195
     <navigator proportions="" version="1">
178 196
       <foldersAlwaysOnTop value="true" />
179 197
     </navigator>
180 198
     <panes>
181
-      <pane id="Scope" />
182 199
       <pane id="ProjectPane">
183 200
         <subPane>
184 201
           <expand>
@@ -191,10 +208,16 @@
191 208
               <item name="SCRM" type="462c0819:PsiDirectoryNode" />
192 209
               <item name="conf" type="462c0819:PsiDirectoryNode" />
193 210
             </path>
211
+            <path>
212
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
213
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
214
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
215
+            </path>
194 216
           </expand>
195 217
           <select />
196 218
         </subPane>
197 219
       </pane>
220
+      <pane id="Scope" />
198 221
     </panes>
199 222
   </component>
200 223
   <component name="PropertiesComponent">
@@ -229,15 +252,15 @@
229 252
   <component name="ToolWindowManager">
230 253
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
231 254
     <layout>
232
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.6819484" visible="true" weight="0.18364611" />
255
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.6632997" visible="true" weight="0.18766756" />
233 256
       <window_info anchor="bottom" id="TODO" order="6" />
234
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.23391421" side_tool="true" weight="0.22396576" />
257
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.288874" side_tool="true" visible="true" weight="0.5763195" />
235 258
       <window_info anchor="right" id="Database" order="3" />
236 259
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
237 260
       <window_info anchor="bottom" id="Version Control" order="9" />
238 261
       <window_info anchor="bottom" id="Run" order="2" />
239
-      <window_info id="Structure" order="1" sideWeight="0.31805158" side_tool="true" visible="true" weight="0.18364611" />
240
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.7660858" visible="true" weight="0.5021398" />
262
+      <window_info id="Structure" order="1" sideWeight="0.33670035" side_tool="true" visible="true" weight="0.18766756" />
263
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.711126" visible="true" weight="0.5763195" />
241 264
       <window_info id="Favorites" order="2" side_tool="true" />
242 265
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
243 266
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -257,7 +280,7 @@
257 280
   </component>
258 281
   <component name="XDebuggerManager">
259 282
     <breakpoint-manager>
260
-      <option name="time" value="1" />
283
+      <option name="time" value="2" />
261 284
     </breakpoint-manager>
262 285
   </component>
263 286
   <component name="editorHistoryManager">
@@ -289,20 +312,6 @@
289 312
         </state>
290 313
       </provider>
291 314
     </entry>
292
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
293
-      <provider selected="true" editor-type-id="text-editor">
294
-        <state relative-caret-position="308">
295
-          <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
296
-        </state>
297
-      </provider>
298
-    </entry>
299
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
300
-      <provider selected="true" editor-type-id="text-editor">
301
-        <state relative-caret-position="2596">
302
-          <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
303
-        </state>
304
-      </provider>
305
-    </entry>
306 315
     <entry file="file://$PROJECT_DIR$/routers/router.go">
307 316
       <provider selected="true" editor-type-id="text-editor">
308 317
         <state relative-caret-position="132">
@@ -541,69 +550,66 @@
541 550
         </state>
542 551
       </provider>
543 552
     </entry>
544
-    <entry file="file://$PROJECT_DIR$/models/activity_models.go">
553
+    <entry file="file://$PROJECT_DIR$/utils/stringtool.go">
545 554
       <provider selected="true" editor-type-id="text-editor">
546
-        <state relative-caret-position="-775">
547
-          <caret line="30" column="95" selection-start-line="30" selection-start-column="95" selection-end-line="30" selection-end-column="95" />
555
+        <state relative-caret-position="214">
556
+          <caret line="33" column="4" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
548 557
         </state>
549 558
       </provider>
550 559
     </entry>
551
-    <entry file="file://$PROJECT_DIR$/models/article_models.go">
560
+    <entry file="file://$PROJECT_DIR$/main.go">
552 561
       <provider selected="true" editor-type-id="text-editor">
553
-        <state relative-caret-position="330">
554
-          <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
562
+        <state relative-caret-position="550">
563
+          <caret line="32" column="44" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="44" />
555 564
         </state>
556 565
       </provider>
557 566
     </entry>
558
-    <entry file="file://$PROJECT_DIR$/models/site_models.go">
567
+    <entry file="file://$PROJECT_DIR$/models/activity_models.go">
559 568
       <provider selected="true" editor-type-id="text-editor">
560
-        <state relative-caret-position="1254">
561
-          <caret line="57" column="6" selection-start-line="57" selection-start-column="6" selection-end-line="57" selection-end-column="6" />
569
+        <state relative-caret-position="470">
570
+          <caret line="99" column="33" selection-start-line="99" selection-start-column="33" selection-end-line="99" selection-end-column="33" />
562 571
         </state>
563 572
       </provider>
564 573
     </entry>
565
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
574
+    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
566 575
       <provider selected="true" editor-type-id="text-editor">
567
-        <state relative-caret-position="528">
568
-          <caret line="42" column="27" selection-start-line="42" selection-start-column="27" selection-end-line="42" selection-end-column="27" />
576
+        <state relative-caret-position="211">
577
+          <caret line="189" column="26" selection-start-line="189" selection-start-column="26" selection-end-line="189" selection-end-column="26" />
569 578
         </state>
570 579
       </provider>
571 580
     </entry>
572
-    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
581
+    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
573 582
       <provider selected="true" editor-type-id="text-editor">
574
-        <state relative-caret-position="1386">
575
-          <caret line="67" column="5" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" />
583
+        <state relative-caret-position="6578">
584
+          <caret line="311" column="58" selection-start-line="311" selection-start-column="47" selection-end-line="311" selection-end-column="58" />
576 585
         </state>
577 586
       </provider>
578 587
     </entry>
579 588
     <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
580 589
       <provider selected="true" editor-type-id="text-editor">
581
-        <state relative-caret-position="81">
582
-          <caret line="315" column="29" selection-start-line="315" selection-start-column="20" selection-end-line="315" selection-end-column="29" />
590
+        <state relative-caret-position="1078">
591
+          <caret line="55" column="53" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="53" />
583 592
         </state>
584 593
       </provider>
585 594
     </entry>
586
-    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
595
+    <entry file="file://$PROJECT_DIR$/models/article_models.go">
587 596
       <provider selected="true" editor-type-id="text-editor">
588
-        <state relative-caret-position="402">
589
-          <caret line="974" column="31" selection-start-line="974" selection-start-column="24" selection-end-line="974" selection-end-column="31" />
597
+        <state relative-caret-position="286">
598
+          <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
590 599
         </state>
591 600
       </provider>
592 601
     </entry>
593
-    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
602
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
594 603
       <provider selected="true" editor-type-id="text-editor">
595
-        <state relative-caret-position="159">
596
-          <caret line="259" column="70" selection-start-line="259" selection-start-column="49" selection-end-line="259" selection-end-column="70" />
597
-          <folding>
598
-            <element signature="e#22#104#0" expanded="true" />
599
-          </folding>
604
+        <state relative-caret-position="132">
605
+          <caret line="24" column="203" selection-start-line="24" selection-start-column="203" selection-end-line="24" selection-end-column="203" />
600 606
         </state>
601 607
       </provider>
602 608
     </entry>
603 609
     <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
604 610
       <provider selected="true" editor-type-id="text-editor">
605
-        <state relative-caret-position="186">
606
-          <caret line="3890" selection-start-line="3890" selection-end-line="3890" />
611
+        <state relative-caret-position="-984">
612
+          <caret line="3211" column="37" selection-start-line="3211" selection-start-column="26" selection-end-line="3211" selection-end-column="37" />
607 613
           <folding>
608 614
             <element signature="e#14#224#0" expanded="true" />
609 615
           </folding>
@@ -617,10 +623,27 @@
617 623
         </state>
618 624
       </provider>
619 625
     </entry>
620
-    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
626
+    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
627
+      <provider selected="true" editor-type-id="text-editor">
628
+        <state relative-caret-position="220">
629
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
630
+        </state>
631
+      </provider>
632
+    </entry>
633
+    <entry file="file://$PROJECT_DIR$/models/site_models.go">
621 634
       <provider selected="true" editor-type-id="text-editor">
622
-        <state relative-caret-position="27">
623
-          <caret line="42" column="33" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="33" />
635
+        <state relative-caret-position="22">
636
+          <caret line="127" column="45" selection-start-line="127" selection-start-column="45" selection-end-line="127" selection-end-column="45" />
637
+        </state>
638
+      </provider>
639
+    </entry>
640
+    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
641
+      <provider selected="true" editor-type-id="text-editor">
642
+        <state relative-caret-position="82">
643
+          <caret line="15" column="117" selection-start-line="15" selection-start-column="117" selection-end-line="15" selection-end-column="117" />
644
+          <folding>
645
+            <element signature="e#23#71#0" expanded="true" />
646
+          </folding>
624 647
         </state>
625 648
       </provider>
626 649
     </entry>

+ 8 - 5
controllers/micro/micro_controller.go Bestand weergeven

@@ -23,7 +23,7 @@ func microRouters(){
23 23
 	beego.Router("/api/site/singleactivitinfo",&Micro{},"Get:GetActivitDetail")
24 24
 	beego.Router("/api/site/singlearticleinfo",&Micro{},"Get:GetArticlesDetail")
25 25
    beego.Router("/api/site/singledoctorinfo",&Micro{},"Get:GetDoctorInfo")
26
-   beego.Router("/api/site/getdata",&Micro,"Get:GetData")
26
+   beego.Router("/api/site/getdata",&Micro{},"Get:GetData")
27 27
 }
28 28
 
29 29
 type Micro struct {
@@ -185,13 +185,15 @@ func (this *Micro) GetArticlistDetail()  {
185 185
 	articlelist, err := micro_service.GetArticlelistById(id, orgid)
186 186
 	fmt.Println(articlelist,err)
187 187
 	//fmt.Println(err)
188
-	articlelists, err := micro_service.GetAllArticles(orgid, articlelist.Number)
188
+	//articlelists, err := micro_service.GetAllArticles(orgid, articlelist.Number)
189
+	articleslist, err := micro_service.GetAllPushArticles(orgid)
190
+	fmt.Println("报错了么",err)
189 191
 	if err !=nil{
190 192
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
191 193
 		return
192 194
 	}
193 195
 	this.ServeSuccessJSON(map[string]interface{}{
194
-		"articlelists":articlelists,
196
+		"articlelists":articleslist,
195 197
 	})
196 198
 }
197 199
 
@@ -202,8 +204,9 @@ func (this *Micro) GetActivitesDetail()  {
202 204
 	fmt.Println("活动id",orgid)
203 205
 	//addactivity, err := micro_service.GetAllActivitiById(id, orgid)
204 206
 	//	fmt.Println("err",err)
205
-	addactivity, err := micro_service.GetLastActivitiesLast(orgid)
206
-	activity, err := micro_service.GetAllActivities(orgid,addactivity.Number)
207
+	//addactivity, err := micro_service.GetLastActivitiesLast(orgid)
208
+	//	//activity, err := micro_service.GetAllActivities(orgid,addactivity.Number)
209
+	activity, err := micro_service.GetAllActivitiestwo(orgid)
207 210
 	if err !=nil{
208 211
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
209 212
 		return

+ 34 - 361
controllers/site/site_controller.go Bestand weergeven

@@ -1279,6 +1279,7 @@ func (this *Microwebsite)  Saverideway()  {
1279 1279
 	}
1280 1280
 
1281 1281
 	err = site_service.UpdateRideWay(id, userOrgID, ridewaymodel)
1282
+	fmt.Println("错误是设么",err)
1282 1283
 	err = site_service.UpdateOrdeModel(modeid, userOrgID, ordmodel)
1283 1284
 	fmt.Println("错误是什么?",err)
1284 1285
 	if err !=nil{
@@ -1798,324 +1799,11 @@ func (this *Microwebsite) GetDefaultData()  {
1798 1799
 
1799 1800
 
1800 1801
 func (this *Microwebsite) GetData()  {
1801
-	//每1秒监听一次使用定时器
1802
-	//ticker := time.NewTicker(5 * time.Second)
1803
-	//	//for _ = range ticker.C {
1804
-	//	//	fmt.Println("当前是时间是是啥呢吗打发发发呆阿道夫",time.Now())
1805
-	//	//
1806
-	//	//}
1807
-
1802
+	fmt.Println("我和我的作古阿斯蒂芬地方地方阿道夫打发阿凡达阿范德萨发撒旦法阿斯蒂芬发送到法阿发法阿发法")
1808 1803
 	adminUserInfo := this.GetAdminUserInfo()
1809 1804
 	userOrgID := int64(adminUserInfo.CurrentOrgId)
1810
-	fmt.Println("机构ID机构ID机构ID机构IDvvvv机构ID机构ID机构ID机构ID机构ID机构ID" ,userOrgID)
1811
-	navigation, err := site_service.GetPatientNavigation(userOrgID)
1812
-	fmt.Println("navigation是什么",len(navigation))
1813
-	if(len(navigation) == 0){
1814
-		patientNavigation := models.SgjPatientNavigation{
1815
-			Navtitle:    "首页",
1816
-			Navimages:   "https://images.shengws.com/2089_o_1571990714383.png",
1817
-			Status:      1,
1818
-			UserOrgId:   userOrgID,
1819
-			Nonavimages: "https://images.shengws.com/2105_o_1571990730785.png",
1820
-			Ctime:       time.Now().Unix(),
1821
-		}
1822
-		err = site_service.AddNavgation(&patientNavigation)
1823
-		fmt.Println(err)
1824
-		sgjPatientNavigation := models.SgjPatientNavigation{
1825
-			Navtitle:    "消息",
1826
-			Navimages:   "https://images.shengws.com/2124_o_1571990749565.png",
1827
-			Status:      1,
1828
-			UserOrgId:   userOrgID,
1829
-			Nonavimages: "https://images.shengws.com/2079_o_1571990763549.png",
1830
-			Ctime:       time.Now().Unix(),
1831
-		}
1832
-		err = site_service.AddNavgation(&sgjPatientNavigation)
1833
-		patientnavigationtwo := models.SgjPatientNavigation{
1834
-			Navtitle:    "电话",
1835
-			Navimages:   "https://images.shengws.com/2092_o_1571990776921.png",
1836
-			Status:      1,
1837
-			UserOrgId:   userOrgID,
1838
-			Nonavimages: "https://images.shengws.com/2100_o_1571990784845.png",
1839
-			Ctime:       time.Now().Unix(),
1840
-		}
1841
-		err = site_service.AddNavgation(&patientnavigationtwo)
1842
-		patientnavigationthree := models.SgjPatientNavigation{
1843
-			Navtitle:    "客服",
1844
-			Navimages:   "https://images.shengws.com/2101_o_1571990903053.png",
1845
-			Status:      1,
1846
-			UserOrgId:   userOrgID,
1847
-			Nonavimages: "https://images.shengws.com/2113_o_1571990915581.png",
1848
-			Ctime:       time.Now().Unix(),
1849
-		}
1850
-		err = site_service.AddNavgation(&patientnavigationthree)
1851
-	}
1852
-
1805
+    fmt.Println("机构id",userOrgID)
1853 1806
 	model, err := site_service.GetData(userOrgID)
1854
-	fmt.Println("model是什么",model)
1855
-	fmt.Println("长度",len(model))
1856
-	fmt.Println("err",err)
1857
-	if (len(model) == 0){
1858
-			patientModel := models.SgjPatientModel{
1859
-				Title:     "轮播图",
1860
-				Sort:      1,
1861
-				UserOrgId: userOrgID,
1862
-				Ctime:     time.Now().Unix(),
1863
-				Status:    1,
1864
-				ModeType:  1,
1865
-			}
1866
-			addPatientModel := site_service.AddPatientModelTwo(&patientModel)
1867
-			fmt.Println("第一个模块id",addPatientModel)
1868
-			sgjPatientModel, err := site_service.GetQueryModelByLastData(userOrgID)
1869
-			fmt.Println("查询模块错误是设么",err)
1870
-			editpiclink := models.SgjPatientEditpiclink{
1871
-				Images:    "https://images.shengws.com/2124_o_1570607834870.png",
1872
-				Sort:      1,
1873
-				UserOrgId: userOrgID,
1874
-				Status:    1,
1875
-				Ctime:     time.Now().Unix(),
1876
-				Modeid:sgjPatientModel.ID,
1877
-			}
1878
-			err = site_service.AddPatientEdit(&editpiclink)
1879
-			fmt.Println("err",err)
1880
-
1881
-			patientmodefour := models.SgjPatientModel{
1882
-				Title:     "魔方导航",
1883
-				Sort:      2,
1884
-				UserOrgId: userOrgID,
1885
-				Ctime:     time.Now().Unix(),
1886
-				Status:    1,
1887
-				ModeType:  8,
1888
-			}
1889
-			addPatientModelTwo := site_service.AddPatientModelTwo(&patientmodefour)
1890
-			fmt.Println(addPatientModelTwo)
1891
-			sgjpatietnmodelfour, err := site_service.GetQueryModelByLastData(userOrgID)
1892
-			fmt.Println("第二个模块id",sgjpatietnmodelfour)
1893
-			fmt.Println(err)
1894
-			editmargin := models.SgjPatientEditmargin{
1895
-				Margtitle: "医院介绍",
1896
-				Margimage: "https://images.shengws.com/2162_o_1571992616722.png",
1897
-				UserOrgId: userOrgID,
1898
-				Status:    1,
1899
-				Ctime:     time.Now().Unix(),
1900
-				Modeid:    sgjpatietnmodelfour.ID,
1901
-			}
1902
-			margin := site_service.AddEditMargin(&editmargin)
1903
-			fmt.Println(margin)
1904
-
1905
-			patientEditmargin := models.SgjPatientEditmargin{
1906
-				Margtitle: "医护团队",
1907
-				Margimage: "https://images.shengws.com/2121_o_1571992634289.png",
1908
-				UserOrgId: userOrgID,
1909
-				Status:    1,
1910
-				Ctime:     time.Now().Unix(),
1911
-				Modeid:    sgjpatietnmodelfour.ID,
1912
-			}
1913
-			err = site_service.AddEditMargin(&patientEditmargin)
1914
-			fmt.Println(err)
1915
-
1916
-			sgjPatientEditmargin := models.SgjPatientEditmargin{
1917
-				Margtitle: "医院动态",
1918
-				Margimage: "https://images.shengws.com/2163_o_1571992676180.png",
1919
-				UserOrgId: userOrgID,
1920
-				Status:    1,
1921
-				Ctime:     time.Now().Unix(),
1922
-				Modeid:    sgjpatietnmodelfour.ID,
1923
-			}
1924
-
1925
-			err = site_service.AddEditMargin(&sgjPatientEditmargin)
1926
-			fmt.Println(err)
1927
-
1928
-			patienteditmarginfour := models.SgjPatientEditmargin{
1929
-				Margtitle: "医院活动",
1930
-				Margimage: "https://images.shengws.com/2117_o_1571992689392.png",
1931
-				UserOrgId: userOrgID,
1932
-				Status:    1,
1933
-				Ctime:     time.Now().Unix(),
1934
-				Modeid:    sgjpatietnmodelfour.ID,
1935
-			}
1936
-
1937
-			err = site_service.AddEditMargin(&patienteditmarginfour)
1938
-			fmt.Println(err)
1939
-
1940
-			patienteditmarginfive := models.SgjPatientEditmargin{
1941
-				Margtitle: "医院环境",
1942
-				Margimage: "https://images.shengws.com/2130_o_1571992702226.png",
1943
-				UserOrgId: userOrgID,
1944
-				Status:    1,
1945
-				Ctime:     time.Now().Unix(),
1946
-				Modeid:    sgjpatietnmodelfour.ID,
1947
-			}
1948
-
1949
-			err = site_service.AddEditMargin(&patienteditmarginfive)
1950
-			fmt.Println(err)
1951
-
1952
-			patienteditmarginsix := models.SgjPatientEditmargin{
1953
-				Margtitle: "咨询客服",
1954
-				Margimage: "https://images.shengws.com/2149_o_1571992721076.png",
1955
-				UserOrgId: userOrgID,
1956
-				Status:    1,
1957
-				Ctime:     time.Now().Unix(),
1958
-				Modeid:    sgjpatietnmodelfour.ID,
1959
-			}
1960
-			err = site_service.AddEditMargin(&patienteditmarginsix)
1961
-			fmt.Println(err)
1962
-
1963
-			patienteditmarginserven := models.SgjPatientEditmargin{
1964
-				Margtitle: "加入会员",
1965
-				Margimage: "https://images.shengws.com/2165_o_1571992737567.png",
1966
-				UserOrgId: userOrgID,
1967
-				Status:    1,
1968
-				Ctime:     time.Now().Unix(),
1969
-				Modeid:    sgjpatietnmodelfour.ID,
1970
-			}
1971
-
1972
-			err = site_service.AddEditMargin(&patienteditmarginserven)
1973
-			fmt.Println(err)
1974
-
1975
-			patienteditmargineghit := models.SgjPatientEditmargin{
1976
-				Margtitle: "联系我们",
1977
-				Margimage: "https://images.shengws.com/2122_o_1571992753168.png",
1978
-				UserOrgId: userOrgID,
1979
-				Status:    1,
1980
-				Ctime:     time.Now().Unix(),
1981
-				Modeid:    sgjpatietnmodelfour.ID,
1982
-			}
1983
-			err = site_service.AddEditMargin(&patienteditmargineghit)
1984
-			fmt.Println(err)
1985
-
1986
-			patientModelTwo := models.SgjPatientModel{
1987
-				Title:     "医院介绍",
1988
-				Sort:      3,
1989
-				UserOrgId: userOrgID,
1990
-				Ctime:     time.Now().Unix(),
1991
-				Status:    1,
1992
-				ModeType:  2,
1993
-			}
1994
-			two := site_service.AddPatientModelTwo(&patientModelTwo)
1995
-			fmt.Println(two)
1996
-			sgjPatientModelTwo, err := site_service.GetQueryModelByLastData(userOrgID)
1997
-			hospital := models.SgjPatientHospital{
1998
-				Title:        "医院介绍",
1999
-				Sort:         3,
2000
-				Introduction: "暂无数据",
2001
-				UserOrgId:    userOrgID,
2002
-				Modleid:      sgjPatientModelTwo.ID,
2003
-				Status:       1,
2004
-				Ctime:        time.Now().Unix(),
2005
-			}
2006
-			addHospital := site_service.AddHospital(&hospital)
2007
-			fmt.Println(addHospital)
2008
-
2009
-			Sgjpatientmodelthree := models.SgjPatientModel{
2010
-				Title:     "科室介绍",
2011
-				Sort:      4,
2012
-				UserOrgId: userOrgID,
2013
-				Ctime:     time.Now().Unix(),
2014
-				Status:    1,
2015
-				ModeType:  3,
2016
-
2017
-			}
2018
-
2019
-			modelTwo := site_service.AddPatientModelTwo(&Sgjpatientmodelthree)
2020
-			fmt.Println(modelTwo)
2021
-			datathree, err := site_service.GetQueryModelByLastData(userOrgID)
2022
-			offices := models.SgjPatientOffices{
2023
-				Title:     "科室介绍",
2024
-				Sort:      4,
2025
-				UserOrgId: userOrgID,
2026
-				Ctime:     time.Now().Unix(),
2027
-				Status:    1,
2028
-				Modleid:   datathree.ID,
2029
-				Introduction:"暂无数据",
2030
-			}
2031
-			err = site_service.AddPatientOffices(&offices)
2032
-			fmt.Println(err)
2033
-
2034
-			patientModelFive := models.SgjPatientModel{
2035
-				Title:     "医护团队",
2036
-				Sort:      5,
2037
-				UserOrgId: userOrgID,
2038
-				Ctime:     time.Now().Unix(),
2039
-				Status:    1,
2040
-				ModeType:  4,
2041
-			}
2042
-			err = site_service.AddPatientModelTwo(&patientModelFive)
2043
-			fmt.Println("err",err)
2044
-			data, err := site_service.GetQueryModelByLastData(userOrgID)
2045
-			fmt.Println(err)
2046
-			editdoctor := models.SgjPatientEditdoctor{
2047
-				Dochead:         "https://images.shengws.com/2062_o_1570608303729.png",
2048
-				DocSort:         1,
2049
-				Docintroduction: "暂时无数据",
2050
-				UserOrgId:       userOrgID,
2051
-				Modleid:         data.ID,
2052
-				Status:1,
2053
-				Ctime:time.Now().Unix(),
2054
-				DocPostion:1,
2055
-			}
2056
-			doctor := site_service.AddEditDoctor(&editdoctor)
2057
-			fmt.Println("doctor",doctor)
2058
-
2059
-			modelserven := models.SgjPatientModel{
2060
-				Title:     "医院环境",
2061
-				Sort:      6,
2062
-				UserOrgId: userOrgID,
2063
-				Ctime:     time.Now().Unix(),
2064
-				Status:    1,
2065
-				ModeType:  5,
2066
-			}
2067
-			err = site_service.AddPatientModelTwo(&modelserven)
2068
-			lastData, err := site_service.GetQueryModelByLastData(userOrgID)
2069
-			enviroimages := models.SgjPatientEnviroimages{
2070
-				Enviroimages: "https://images.shengws.com/2074_o_1570608492452.png",
2071
-				Sort:         1,
2072
-				UserOrgId:    userOrgID,
2073
-				Status:       1,
2074
-				Modeid:       lastData.ID,
2075
-				Ctime:        time.Now().Unix(),
2076
-			}
2077
-			err = site_service.AddImages(&enviroimages)
2078
-			fmt.Println("err",err)
2079
-		//    modeleight := models.SgjPatientModel{
2080
-		//	  Title:     "文章列表",
2081
-		//	  Sort:      7,
2082
-		//	  UserOrgId: userOrgID,
2083
-		//	  Ctime:     time.Now().Unix(),
2084
-		//	  Status:    1,
2085
-		//	  ModeType:  6,
2086
-	    	//}
2087
-		//   err = site_service.AddPatientModelTwo(&modeleight)
2088
-		//byLastData, err := site_service.GetQueryModelByLastData(userOrgID)
2089
-		//fmt.Println(byLastData,err)
2090
-		//articlelist := models.SgjPatientArticlelist{
2091
-		//	Title:       "文章列表",
2092
-		//	Sort:7,
2093
-		//	UserOrgId:   userOrgID,
2094
-		//	Status:      1,
2095
-		//	Ctime:       time.Now().Unix(),
2096
-		//	Number:      1,
2097
-		//	Modeid:      byLastData.ID,
2098
-		//}
2099
-		//err = site_service.AddActiclelist(&articlelist)
2100
-		//articles := models.Articles{
2101
-		//	Title:     "文章列表",
2102
-		//	UserOrgId: userOrgID,
2103
-		//	Content:   "暂无数据",
2104
-		//	Imgs:"https://images.shengws.com/2062_o_1570608303729.png",
2105
-		//}
2106
-		//err = site_service.AddActicles(&articles)
2107
-		//fmt.Println("错误",err)
2108
-		//modelnight := models.SgjPatientModel{
2109
-		//	Title:     "活动列表",
2110
-		//	Sort:      8,
2111
-		//	UserOrgId: userOrgID,
2112
-		//	Ctime:     time.Now().Unix(),
2113
-		//	Status:    1,
2114
-		//	ModeType:  7,
2115
-		//}
2116
-		//err = site_service.AddPatientModelTwo(&modelnight)
2117
-	}
2118
-	fmt.Println(model,err)
2119 1807
 	if err !=nil{
2120 1808
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
2121 1809
 		return
@@ -2124,8 +1812,6 @@ func (this *Microwebsite) GetData()  {
2124 1812
 		"patientModels":model,
2125 1813
 
2126 1814
 	})
2127
-
2128
-
2129 1815
 }
2130 1816
 
2131 1817
 func (this *Microwebsite) EditDoctor()  {
@@ -2769,6 +2455,7 @@ func (this *Microwebsite) GetOrderModel()  {
2769 2455
 }
2770 2456
 
2771 2457
 func  (this *Microwebsite) AddRotationpic()  {
2458
+	fmt.Println("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
2772 2459
 	adminUserInfo := this.GetAdminUserInfo()
2773 2460
 	userOrgID := int64(adminUserInfo.CurrentOrgId)
2774 2461
 	fmt.Println("机构ID",userOrgID)
@@ -2980,6 +2667,8 @@ func (this *Microwebsite)  AddImageslink()  {
2980 2667
 
2981 2668
 	err = site_service.AddImageslink(&editpiclink)
2982 2669
 	edipiclink, total, err := site_service.GetCountImages(userOrgID)
2670
+	fmt.Println("错误是什么错误是什么错误是什么错误是什么错误是什么",err)
2671
+	fmt.Println(total)
2983 2672
 	fmt.Println(edipiclink)
2984 2673
 	if err !=nil{
2985 2674
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
@@ -4076,10 +3765,10 @@ func (this *Microwebsite) AddArticelist()  {
4076 3765
 	if len(title)==0 {
4077 3766
 	   title = "暂无数据"
4078 3767
 	}
4079
-	category := int64(dataBody["category"].(float64))
4080
-	fmt.Println("文章分类",category)
4081
-	categoryone := int64(dataBody["categoryone"].(float64))
4082
-	fmt.Println("文章分类2",categoryone)
3768
+	//category := int64(dataBody["category"].(float64))
3769
+	//fmt.Println("文章分类",category)
3770
+	//categoryone := int64(dataBody["categoryone"].(float64))
3771
+	//fmt.Println("文章分类2",categoryone)
4083 3772
 	number := int64(dataBody["number"].(float64))
4084 3773
 	fmt.Println("展示数据",number)
4085 3774
 	sort := int64(dataBody["sort"].(float64))
@@ -4100,8 +3789,6 @@ func (this *Microwebsite) AddArticelist()  {
4100 3789
 		UserOrgId:   userOrgID,
4101 3790
 		Status:      1,
4102 3791
 		Ctime:       time.Now().Unix(),
4103
-		Category:    category,
4104
-		Categoryone: categoryone,
4105 3792
 		Number:      number,
4106 3793
 		Modeid:      patientModel.ID,
4107 3794
 	}
@@ -4814,22 +4501,14 @@ func (this *Microwebsite) AddMagiclinkData()  {
4814 4501
 	fmt.Println("链接类型",linkType)
4815 4502
 	Instationlink := int64(dataBody["instationlink"].(float64))
4816 4503
 	fmt.Println("站内链接",Instationlink)
4504
+	//intstationlink, err := strconv.ParseInt(Instationlink, 10, 64)
4817 4505
 	//articeType := int64(dataBody["articeType"].(float64))
4818 4506
 	//fmt.Println("文章分类",articeType)
4819 4507
 	phone := dataBody["phone"].(string)
4820 4508
 	fmt.Println("电话号码",phone)
4821 4509
 	outstationlink := dataBody["outstationlink"].(string)
4822 4510
 	fmt.Println("站外链接",outstationlink)
4823
-	linkaddress := int64(dataBody["linkaddress"].(float64))
4824
-	formatInt := strconv.FormatInt(linkaddress, 10)
4825
-	fmt.Println("链接地址",linkaddress)
4826
-	//articeTtitle := int64(dataBody["title"].(float64))
4827
-	if(phone != ""){
4828
-		formatInt = phone
4829
-	}
4830
-	if(outstationlink !=""){
4831
-		formatInt = outstationlink
4832
-	}
4511
+
4833 4512
 	magiclink := models.SgjPatientMagiclink{
4834 4513
 		Linktype:       linkType,
4835 4514
 		Instationlink:  Instationlink,
@@ -4837,18 +4516,16 @@ func (this *Microwebsite) AddMagiclinkData()  {
4837 4516
 		Outstationlink: outstationlink,
4838 4517
 		Ctime:time.Now().Unix(),
4839 4518
 		Status:1,
4840
-		Linkaddress:formatInt,
4841 4519
 		UserOrgId:userOrgID,
4842 4520
 	}
4843 4521
 	err = site_service.AddMagiclinkData(&magiclink)
4844
-	patientMagiclink, err := site_service.GetMacLinkAddress(userOrgID)
4845
-	if err !=nil{
4846
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
4847
-		return
4848
-	}
4522
+	fmt.Println("错误",err)
4523
+	model, err := site_service.GetPatienModelByModelId(Instationlink, userOrgID)
4524
+	fmt.Println("错误",err)
4525
+	fmt.Println("model",model)
4849 4526
 	this.ServeSuccessJSON(map[string]interface{}{
4850 4527
 		"magiclink":magiclink,
4851
-		"patientMagiclink":patientMagiclink,
4528
+		"model":model,
4852 4529
 	})
4853 4530
 }
4854 4531
 
@@ -5152,40 +4829,33 @@ func  (this*Microwebsite) AddMacLinkAddress()  {
5152 4829
 		return
5153 4830
 	}
5154 4831
 	linktype := int64(dataBody["linktype"].(float64))
5155
-	fmt.Println("链接类型",linktype)
4832
+	fmt.Println("linktype",linktype)
5156 4833
 	instationlink := int64(dataBody["instationlink"].(float64))
5157
-	fmt.Println("站内链接",instationlink)
5158
-	articetype := int64(dataBody["articetype"].(float64))
5159
-	fmt.Println("文字类型",articetype)
5160
-	title := int64(dataBody["title"].(float64))
5161
-	fmt.Println("文章id",title)
4834
+	fmt.Println("instationlink",instationlink)
5162 4835
 	phone := dataBody["phone"].(string)
5163
-	fmt.Println("电话",phone)
4836
+	fmt.Println("phone",phone)
5164 4837
 	outstationlink := dataBody["outstationlink"].(string)
5165
-	fmt.Println("站内链接",outstationlink)
5166
-	linkaddress := dataBody["linkaddress"].(string)
5167
-	fmt.Println("链接地址",linkaddress)
4838
+	fmt.Println("outtationlink",outstationlink)
5168 4839
 	magiclink := models.SgjPatientMagiclink{
5169 4840
 		Linktype:       linktype,
5170 4841
 		Instationlink:  instationlink,
5171
-		Articetype:     articetype,
5172
-		Title:          title,
5173 4842
 		Phone:          phone,
5174 4843
 		Outstationlink: outstationlink,
5175
-		Linkaddress:    linkaddress,
5176
-		Ctime:time.Now().Unix(),
5177
-		Status:1,
5178
-		UserOrgId:userOrgID,
4844
+		Ctime:          time.Now().Unix(),
4845
+		Status:         1,
5179 4846
 	}
4847
+	fmt.Println("magiclink",magiclink)
5180 4848
 	err = site_service.AddMacLinkAddress(&magiclink)
5181
-	patientMagiclink, err := site_service.GetMacLinkAddress(userOrgID)
4849
+	model, err := site_service.GetPatienModelByModelId(instationlink, userOrgID)
4850
+	fmt.Println(err)
4851
+	//patientMagiclink, err := site_service.GetMacLinkAddress(userOrgID)
5182 4852
 	if err !=nil{
5183 4853
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
5184 4854
 		return
5185 4855
 	}
5186 4856
 	this.ServeSuccessJSON(map[string]interface{}{
5187
-		"patientMagiclink":patientMagiclink,
5188 4857
 		"magiclink":magiclink,
4858
+		"model":model,
5189 4859
 	})
5190 4860
 
5191 4861
 }
@@ -5207,11 +4877,12 @@ func  (this*Microwebsite) GetLinkAddress()  {
5207 4877
 }
5208 4878
 
5209 4879
 func (this*Microwebsite) GetCountImages()  {
4880
+	fmt.Println("")
5210 4881
 	adminUserInfo := this.GetAdminUserInfo()
5211 4882
 	userOrgID := adminUserInfo.CurrentOrgId
5212
-	fmt.Println("机构id", userOrgID)
4883
+	fmt.Println("机构id机构id记过id九宫UID", userOrgID)
5213 4884
 	edipiclink, total, err := site_service.GetCountImages(userOrgID)
5214
-	fmt.Println("edipiclink是什么",edipiclink)
4885
+	fmt.Println("edipiclink是什么edipiclink是什么edipiclink是什么edipiclink是什么",edipiclink)
5215 4886
 	fmt.Println("total是什么",total)
5216 4887
 	fmt.Println("err是什么",err)
5217 4888
 }
@@ -5798,4 +5469,6 @@ func (this *Microwebsite)  AddRotationVisibleForm(){
5798 5469
 	this.ServeSuccessJSON(map[string]interface{}{
5799 5470
 		"linkaddress":linkaddress,
5800 5471
 	})
5801
-}
5472
+}
5473
+
5474
+

+ 2 - 1
main.go Bestand weergeven

@@ -5,6 +5,7 @@ import (
5 5
 	_ "SCRM/routers"
6 6
 	"SCRM/service"
7 7
 
8
+	"SCRM/service/site_service"
8 9
 	"github.com/astaxie/beego"
9 10
 )
10 11
 
@@ -29,6 +30,6 @@ func main() {
29 30
 
30 31
 	go jobcron.RequestQNToken()
31 32
 	jobcron.BeginRerequestQNTokenCronJob()
32
-
33
+     site_service.BeginAutoCreateDefalutData()
33 34
 	beego.Run()
34 35
 }

+ 16 - 0
models/activity_models.go Bestand weergeven

@@ -83,3 +83,19 @@ type ActivityWxShare struct {
83 83
 func (ActivityWxShare) TableName() string {
84 84
 	return "sgj_patient_activity_wx_share"
85 85
 }
86
+
87
+
88
+type PatientOrdmodel struct {
89
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
90
+	Title string `gorm:"column:title" json:"title" form:"title"`
91
+	Sort int64 `gorm:"column:sort" json:"sort" form:"sort"`
92
+	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
93
+	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
94
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
95
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
96
+	ModeType int64 `gorm:"column:mode_type" json:"mode_type" form:"mode_type"`
97
+}
98
+
99
+func (PatientOrdmodel) TableName() string {
100
+	return "sgj_patient_ordmodel"
101
+}

+ 0 - 1
models/article_models.go Bestand weergeven

@@ -12,7 +12,6 @@ type ArticleCategory struct{
12 12
 	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
13 13
 	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
14 14
 	Num int64 `gorm:"column:num" json:"num" form:"num"`
15
-	Count int64
16 15
 }
17 16
 
18 17
 func (ArticleCategory) TableName() string  {

+ 5 - 3
models/site_models.go Bestand weergeven

@@ -519,16 +519,15 @@ type SgjPatientMagiclink struct {
519 519
 	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
520 520
 	Linktype int64 `gorm:"column:linktype" json:"linktype" form:"linktype"`
521 521
 	Instationlink int64 `gorm:"column:instationlink" json:"instationlink" form:"instationlink"`
522
-	Articetype int64 `gorm:"column:articetype" json:"articetype" form:"articetype"`
523 522
 	Phone string `gorm:"column:phone" json:"phone" form:"phone"`
524 523
 	Outstationlink string `gorm:"column:outstationlink" json:"outstationlink" form:"outstationlink"`
525 524
 	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
526 525
 	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
527 526
 	Status int64 `gorm:"column:status" json:"status" form:"status"`
528 527
 	Linkaddress string `gorm:"column:linkaddress" json:"linkaddress" form:"linkaddress"`
529
-	Title int64 `gorm:"column:title" json:"title" form:"title"`
530 528
 }
531 529
 
530
+
532 531
 func (SgjPatientMagiclink)TableName() string  {
533 532
 
534 533
 	return "sgj_patient_magiclink"
@@ -550,6 +549,9 @@ type PatientNavgationlink struct {
550 549
 }
551 550
 
552 551
 func (PatientNavgationlink) TableName() string  {
553
-
554 552
 	return "sgj_patient_navgationlink"
553
+}
554
+
555
+type OrgInfo struct {
556
+	ID  int64
555 557
 }

+ 1 - 1
routers/router.go Bestand weergeven

@@ -22,7 +22,7 @@ import (
22 22
 
23 23
 func init() {
24 24
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
25
-		AllowOrigins:     []string{"http://jk.kuyicloud.com", "http://localhost:8090","http://localhost:8091", "http://test1.sgjyun.com", "https://www.ucpaas.com","http://microweb.kuyicloud.com"},
25
+		AllowOrigins:     []string{"http://jk.kuyicloud.com", "http://localhost:8090","http://localhost:8091", "http://test1.sgjyun.com", "https://www.ucpaas.com","http://microweb.kuyicloud.com","http://jk.test.sgjyun.com"},
26 26
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
27 27
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
28 28
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},

+ 9 - 3
service/micro_service/micro_service.go Bestand weergeven

@@ -13,7 +13,7 @@ func GetData(orgid int64)(model []*models.SgjPatientModel,err error)  {
13 13
 		db = db.Where("user_org_id = ? ", orgid)
14 14
 	}
15 15
 	err = db.Preload("Hospitals").Preload("Offices").Preload("OfficeEnviroment").
16
-		Preload("Editdoctor").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink").
16
+		Preload("Editdoctor").Preload("Editmargin").Preload("Enviroimages").Preload("PatientEditpiclink").Order("sort").
17 17
 		Select("m.id,m.title,m.sort,m.ctime,m.mtime,m.user_org_id,m.status,m.mode_type").Order("sort").Find(&model).Error
18 18
 	return
19 19
 }
@@ -37,7 +37,7 @@ func GetlastLimit(orgid int64)(models.SgjPatientArticlelist,error)   {
37 37
 }
38 38
 
39 39
 func GetAllArticeList(orgid int64,limit int64)(articles []models.Articles,err error)  {
40
-	err = service.PatientReadDB().Model(&articles).Where("user_org_id = ? AND status = ?", orgid, 1).Limit(limit).Find(&articles).Error
40
+	err = service.PatientReadDB().Model(&articles).Where("user_org_id = ? AND status = ? AND article_status = ?", orgid, 1,1).Limit(limit).Order("ctime desc").Find(&articles).Error
41 41
 	return articles,err
42 42
 }
43 43
 
@@ -61,7 +61,7 @@ func GetAllActivities(orgid int64,limit int64)(activity []models.Activity,err er
61 61
 
62 62
 
63 63
 func GetAllActivitiestwo(orgid int64)(activity []models.Activity,err error)  {
64
-	err = service.PatientReadDB().Model(activity).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&activity).Error
64
+	err = service.PatientReadDB().Model(activity).Where("user_org_id = ? AND status = ?", orgid, 1).Order("ctime desc").Find(&activity).Error
65 65
 	return activity,err
66 66
 }
67 67
 
@@ -97,6 +97,12 @@ func GetAllArticles(orgid int64,limit int64)(articlelist []models.Articles,err e
97 97
 	return
98 98
 }
99 99
 
100
+func GetAllPushArticles(orgid int64)(articleslist []models.Articles,err error)  {
101
+
102
+	err = service.PatientReadDB().Model(articleslist).Where("user_org_id = ? AND article_status = ? AND status = ?", orgid, 1, 1).Order("ctime desc").Find(&articleslist).Error
103
+	return
104
+}
105
+
100 106
 func GetAllActivitiById(modeid int64,orgID int64)(models.SgjPatientAddactivity,error)  {
101 107
 	addactivity := models.SgjPatientAddactivity{}
102 108
 	err := service.PatientReadDB().Model(addactivity).Where("modeid = ? AND user_org_id = ? AND Status = ?", modeid, orgID, 1).Find(&addactivity).Error

+ 535 - 3
service/site_service/site_microwebsite_service.go Bestand weergeven

@@ -6,8 +6,497 @@ import (
6 6
 	"fmt"
7 7
 	"time"
8 8
 	"github.com/jinzhu/gorm"
9
+	"github.com/robfig/cron"
10
+	"SCRM/utils"
11
+	"strconv"
9 12
 )
10 13
 
14
+// cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
15
+var createDefalutDataCronJob *cron.Cron
16
+
17
+func BeginAutoCreateDefalutData() {
18
+	//createDefalutDataCronJob.Start()
19
+}
20
+
21
+func init()  {
22
+	utils.InfoLog("开启自动排班定时任务")
23
+	createDefalutDataCronJob = cron.New()
24
+	spec := "*/5 * * * * ?" // 每隔5秒执行一次
25
+	createDefalutDataCronJob.AddFunc(spec, func() {
26
+		AutoCreateDefalutSchedules()
27
+	})
28
+}
29
+
30
+func AutoCreateDefalutSchedules()  {
31
+	utils.TraceLog("自动添加数据任务开始执行")
32
+	//获取是10分前的时间
33
+     var orginfo  []*models.OrgInfo
34
+	nowtime := time.Now().Unix()
35
+	fmt.Println("当前时间",nowtime)
36
+	timebefor := time.Now().Add(-time.Minute * 10).Unix()
37
+	fmt.Println("10分钟之前时间",timebefor)
38
+	//1570653733  //1570654333
39
+	err := service.PatientReadDB().Raw("select * from sgj_users.sgj_user_org as u where u.ctime>=? AND u.ctime<= ?", timebefor, nowtime).Scan(&orginfo).Error
40
+	fmt.Println("err",err)
41
+    fmt.Println("orginfo",orginfo)
42
+	for i:=0;i< len(orginfo);i++  {
43
+		userOrgID := orginfo[i].ID
44
+		fmt.Println("ID是设么",userOrgID)
45
+		navigation, err := GetPatientNavigation(userOrgID)
46
+		fmt.Println("err",err)
47
+		if(len(navigation) == 0){
48
+			patientNavigation := models.SgjPatientNavigation{
49
+				Navtitle:    "首页",
50
+				Navimages:   "https://images.shengws.com/2089_o_1571990714383.png",
51
+				Status:      1,
52
+				UserOrgId:   userOrgID,
53
+				Nonavimages: "https://images.shengws.com/2105_o_1571990730785.png",
54
+				Linktype: 1,
55
+				Ctime:       time.Now().Unix(),
56
+			}
57
+			err := AddNavgation(&patientNavigation)
58
+			fmt.Println("err",err)
59
+
60
+
61
+			patientnavigationthree := models.SgjPatientNavigation{
62
+				Navtitle:    "客服",
63
+				Navimages:   "https://images.shengws.com/2101_o_1571990903053.png",
64
+				Status:      1,
65
+				UserOrgId:   userOrgID,
66
+				Nonavimages: "https://images.shengws.com/2113_o_1571990915581.png",
67
+				Linktype:2,
68
+				Ctime:       time.Now().Unix(),
69
+			}
70
+			err = AddNavgation(&patientnavigationthree)
71
+
72
+			patientnavigationtwo := models.SgjPatientNavigation{
73
+				Navtitle:    "电话",
74
+				Navimages:   "https://images.shengws.com/2092_o_1571990776921.png",
75
+				Status:      1,
76
+				UserOrgId:   userOrgID,
77
+				Linktype:3,
78
+				Nonavimages: "https://images.shengws.com/2100_o_1571990784845.png",
79
+				Ctime:       time.Now().Unix(),
80
+			}
81
+			err = AddNavgation(&patientnavigationtwo)
82
+
83
+			sgjPatientNavigation := models.SgjPatientNavigation{
84
+				Navtitle:    "联系我们",
85
+				Navimages:   "https://images.shengws.com/2124_o_1571990749565.png",
86
+				Status:      1,
87
+				UserOrgId:   userOrgID,
88
+				Nonavimages: "https://images.shengws.com/2079_o_1571990763549.png",
89
+				Linktype:4,
90
+				Ctime:       time.Now().Unix(),
91
+			}
92
+			err = AddNavgation(&sgjPatientNavigation)
93
+			fmt.Println("err",err)
94
+		}
95
+
96
+		model, err := GetData(userOrgID)
97
+		if(len(model) == 0){
98
+			patientModel := models.SgjPatientModel{
99
+				Title:     "轮播图",
100
+				Sort:      1,
101
+				UserOrgId: userOrgID,
102
+				Ctime:     time.Now().Unix(),
103
+				Status:    1,
104
+				ModeType:  1,
105
+			}
106
+			err := AddPatientModelTwo(&patientModel)
107
+			fmt.Println("err",err)
108
+			sgjPatientModel, err := GetQueryModelByLastData(userOrgID)
109
+			editpiclink := models.SgjPatientEditpiclink{
110
+				Images:    "https://images.shengws.com/2124_o_1570607834870.png",
111
+				Sort:      1,
112
+				UserOrgId: userOrgID,
113
+				Status:    1,
114
+				Ctime:     time.Now().Unix(),
115
+				Modeid:sgjPatientModel.ID,
116
+			}
117
+			err = AddPatientEdit(&editpiclink)
118
+			fmt.Println("err",err)
119
+
120
+			patientmodefour := models.SgjPatientModel{
121
+				Title:     "魔方导航",
122
+				Sort:      2,
123
+				UserOrgId: userOrgID,
124
+				Ctime:     time.Now().Unix(),
125
+				Status:    1,
126
+				ModeType:  8,
127
+			}
128
+			err = AddPatientModelTwo(&patientmodefour)
129
+			sgjpatietnmodelfour, err := GetQueryModelByLastData(userOrgID)
130
+			ID :=int64(sgjpatietnmodelfour.ID + 1)
131
+			fmt.Println("ID是多少",ID)
132
+			modeid := strconv.FormatInt(ID, 10)
133
+			orgid := strconv.FormatInt(userOrgID, 10)
134
+			KeID :=int64(sgjpatietnmodelfour.ID + 3)
135
+			OfficeID := strconv.FormatInt(KeID, 10)
136
+			ActiID :=int64(sgjpatietnmodelfour.ID + 5)
137
+			ActisID := strconv.FormatInt(ActiID, 10)
138
+			ActivID :=int64(sgjpatietnmodelfour.ID + 6)
139
+			ActivsID := strconv.FormatInt(ActivID, 10)
140
+			editmargin := models.SgjPatientEditmargin{
141
+				Margtitle: "医院介绍",
142
+				Margimage: "https://images.shengws.com/2162_o_1571992616722.png",
143
+				UserOrgId: userOrgID,
144
+				Status:    1,
145
+				Ctime:     time.Now().Unix(),
146
+				Modeid:    sgjpatietnmodelfour.ID,
147
+				Jumpset:2,
148
+				Marginaddress:"http://jk.test.sgjyun.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid ,
149
+			}
150
+			err = AddEditMargin(&editmargin)
151
+			patientEditmargin := models.SgjPatientEditmargin{
152
+				Margtitle: "医护团队",
153
+				Margimage: "https://images.shengws.com/2121_o_1571992634289.png",
154
+				UserOrgId: userOrgID,
155
+				Status:    1,
156
+				Ctime:     time.Now().Unix(),
157
+				Modeid:    sgjpatietnmodelfour.ID,
158
+				Jumpset:2,
159
+				Marginaddress:"http://jk.test.sgjyun.com/#/medicalTeam?id="+OfficeID+"&orgid="+orgid,
160
+			}
161
+			err = AddEditMargin(&patientEditmargin)
162
+			sgjPatientEditmargin := models.SgjPatientEditmargin{
163
+				Margtitle: "医院动态",
164
+				Margimage: "https://images.shengws.com/2163_o_1571992676180.png",
165
+				UserOrgId: userOrgID,
166
+				Status:    1,
167
+				Ctime:     time.Now().Unix(),
168
+				Modeid:    sgjpatietnmodelfour.ID,
169
+				Jumpset:2,
170
+				Marginaddress:"http://jk.test.sgjyun.com/#/news?id="+ActisID+"&orgid="+orgid,
171
+			}
172
+			AddEditMargin(&sgjPatientEditmargin)
173
+			patienteditmarginfour := models.SgjPatientEditmargin{
174
+				Margtitle: "医院活动",
175
+				Margimage: "https://images.shengws.com/2117_o_1571992689392.png",
176
+				UserOrgId: userOrgID,
177
+				Status:    1,
178
+				Ctime:     time.Now().Unix(),
179
+				Modeid:    sgjpatietnmodelfour.ID,
180
+				Jumpset:2,
181
+				Marginaddress:"http://jk.test.sgjyun.com/#/activity?id="+ActivsID+"&orgid="+orgid,
182
+			}
183
+			AddEditMargin(&patienteditmarginfour)
184
+			patienteditmarginfive := models.SgjPatientEditmargin{
185
+				Margtitle: "医院环境",
186
+				Margimage: "https://images.shengws.com/2130_o_1571992702226.png",
187
+				UserOrgId: userOrgID,
188
+				Status:    1,
189
+				Ctime:     time.Now().Unix(),
190
+				Modeid:    sgjpatietnmodelfour.ID,
191
+				Jumpset:2,
192
+				Marginaddress:"http://jk.test.sgjyun.com/#/hospitalIntroduction?id="+modeid+"&orgid="+orgid,
193
+			}
194
+			AddEditMargin(&patienteditmarginfive)
195
+			patienteditmarginsix := models.SgjPatientEditmargin{
196
+				Margtitle: "咨询客服",
197
+				Margimage: "https://images.shengws.com/2149_o_1571992721076.png",
198
+				UserOrgId: userOrgID,
199
+				Status:    1,
200
+				Ctime:     time.Now().Unix(),
201
+				Modeid:    sgjpatietnmodelfour.ID,
202
+				Jumpset:2,
203
+			}
204
+			AddEditMargin(&patienteditmarginsix)
205
+
206
+			patienteditmarginserven := models.SgjPatientEditmargin{
207
+				Margtitle: "加入会员",
208
+				Margimage: "https://images.shengws.com/2165_o_1571992737567.png",
209
+				UserOrgId: userOrgID,
210
+				Status:    1,
211
+				Ctime:     time.Now().Unix(),
212
+				Modeid:    sgjpatietnmodelfour.ID,
213
+				Jumpset:2,
214
+			}
215
+			AddEditMargin(&patienteditmarginserven)
216
+
217
+			patienteditmargineghit := models.SgjPatientEditmargin{
218
+				Margtitle: "联系我们",
219
+				Margimage: "https://images.shengws.com/2122_o_1571992753168.png",
220
+				UserOrgId: userOrgID,
221
+				Status:    1,
222
+				Ctime:     time.Now().Unix(),
223
+				Modeid:    sgjpatietnmodelfour.ID,
224
+			}
225
+			AddEditMargin(&patienteditmargineghit)
226
+
227
+			patientModelTwo := models.SgjPatientModel{
228
+				Title:     "医院介绍",
229
+				Sort:      4,
230
+				UserOrgId: userOrgID,
231
+				Ctime:     time.Now().Unix(),
232
+				Status:    1,
233
+				ModeType:  2,
234
+			}
235
+			AddPatientModelTwo(&patientModelTwo)
236
+
237
+			sgjPatientModelTwo, err := GetQueryModelByLastData(userOrgID)
238
+			hospital := models.SgjPatientHospital{
239
+				Title:        "医院介绍",
240
+				Sort:         4,
241
+				Introduction: "",
242
+				UserOrgId:    userOrgID,
243
+				Modleid:      sgjPatientModelTwo.ID,
244
+				Status:       1,
245
+				Ctime:        time.Now().Unix(),
246
+			}
247
+			AddHospital(&hospital)
248
+
249
+			Sgjpatientmodelthree := models.SgjPatientModel{
250
+				Title:     "科室介绍",
251
+				Sort:      8,
252
+				UserOrgId: userOrgID,
253
+				Ctime:     time.Now().Unix(),
254
+				Status:    1,
255
+				ModeType:  3,
256
+
257
+			}
258
+			AddPatientModelTwo(&Sgjpatientmodelthree)
259
+			datathree, err := GetQueryModelByLastData(userOrgID)
260
+			offices := models.SgjPatientOffices{
261
+				Title:     "科室介绍",
262
+				Sort:      4,
263
+				UserOrgId: userOrgID,
264
+				Ctime:     time.Now().Unix(),
265
+				Status:    1,
266
+				Modleid:   datathree.ID,
267
+				Introduction:"",
268
+			}
269
+			AddPatientOffices(&offices)
270
+			patientModelFive := models.SgjPatientModel{
271
+				Title:     "医护团队",
272
+				Sort:      5,
273
+				UserOrgId: userOrgID,
274
+				Ctime:     time.Now().Unix(),
275
+				Status:    1,
276
+				ModeType:  4,
277
+			}
278
+			AddPatientModelTwo(&patientModelFive)
279
+			data, err := GetQueryModelByLastData(userOrgID)
280
+			editdoctor := models.SgjPatientEditdoctor{
281
+				Dochead:         "https://images.shengws.com/2062_o_1570608303729.png",
282
+				DocSort:         1,
283
+				Docintroduction: "",
284
+				UserOrgId:       userOrgID,
285
+				Modleid:         data.ID,
286
+				Status:1,
287
+				Ctime:time.Now().Unix(),
288
+				DocPostion:1,
289
+			}
290
+			AddEditDoctor(&editdoctor)
291
+
292
+			modelserven := models.SgjPatientModel{
293
+				Title:     "医院环境",
294
+				Sort:      6,
295
+				UserOrgId: userOrgID,
296
+				Ctime:     time.Now().Unix(),
297
+				Status:    1,
298
+				ModeType:  5,
299
+			}
300
+			AddPatientModelTwo(&modelserven)
301
+			lastData, err := GetQueryModelByLastData(userOrgID)
302
+			enviroimages := models.SgjPatientEnviroimages{
303
+				Enviroimages: "https://images.shengws.com/2076_o_1572602899145.jpg",
304
+				Sort:         1,
305
+				UserOrgId:    userOrgID,
306
+				Status:       1,
307
+				Modeid:       lastData.ID,
308
+				Ctime:        time.Now().Unix(),
309
+			}
310
+			AddImages(&enviroimages)
311
+
312
+			modelArticles := models.SgjPatientModel{
313
+				Title:     "医院动态",
314
+				Sort:      3,
315
+				UserOrgId: userOrgID,
316
+				Ctime:     time.Now().Unix(),
317
+				Status:    1,
318
+				ModeType:  6,
319
+			}
320
+			AddPatientModelTwo(&modelArticles)
321
+			articleslist, err := GetQueryModelByLastData(userOrgID)
322
+			fmt.Println("articleslist",articleslist)
323
+			fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
324
+			articlelist := models.SgjPatientArticlelist{
325
+				Title:       "医院动态",
326
+			   Sort:3,
327
+				UserOrgId:   userOrgID,
328
+				Status:      1,
329
+				Ctime:       time.Now().Unix(),
330
+				Number:      1,
331
+				Modeid:      articleslist.ID,
332
+	     	}
333
+			AddActiclelist(&articlelist)
334
+			fmt.Println("我爱你中国法阿发法阿凡达阿凡达阿道夫阿道夫阿道夫阿发阿凡达暗室逢灯阿斯蒂芬暗室逢灯")
335
+			articles, err := GetAritclesData(userOrgID)
336
+			if(len(articles) == 0){
337
+				articles := models.Articles{
338
+					Title:     "",
339
+					Content:   "",
340
+					Imgs:      "https://images.shengws.com/2062_o_1570608303729.png",
341
+					Status:    1,
342
+					Ctime:     time.Now().Unix(),
343
+					UserOrgId: userOrgID,
344
+					ArticleStatus:1,
345
+				}
346
+				AddActicles(&articles)
347
+			}
348
+
349
+			modelActivitis := models.SgjPatientModel{
350
+				Title:     "医院活动",
351
+				Sort:      7,
352
+				UserOrgId: userOrgID,
353
+				Ctime:     time.Now().Unix(),
354
+				Status:    1,
355
+				ModeType:  7,
356
+			}
357
+			AddPatientModelTwo(&modelActivitis)
358
+			activtiys, err := GetQueryModelByLastData(userOrgID)
359
+			addactivity := models.SgjPatientAddactivity{
360
+				Title:     "医院活动",
361
+				Sort:      7,
362
+				UserOrgId: userOrgID,
363
+				Ctime:     time.Now().Unix(),
364
+				Status:    1,
365
+				Modeid:  activtiys.ID,
366
+				Number:1,
367
+			}
368
+            AddActivity(&addactivity)
369
+
370
+			activity, err := GetArititys(userOrgID)
371
+			if(len(activity) == 0){
372
+				activity := models.Activity{
373
+					Title:       "医院活动",
374
+					PosterPhoto: "https://images.shengws.com/2062_o_1570608303729.png",
375
+					UserOrgId:   userOrgID,
376
+					CreateTime:  time.Now().Unix(),
377
+					Status:      1,
378
+				}
379
+				AddActivitys(&activity)
380
+			}
381
+
382
+		}
383
+
384
+		oldmodels, err := GetContactUsModel(userOrgID)
385
+		fmt.Println("orgmodels是设么",oldmodels)
386
+		if(len(oldmodels) == 0){
387
+			ordmodel := models.PatientOrdmodel{
388
+				Title:     "轮播图",
389
+				UserOrgId: userOrgID,
390
+				Sort:      1,
391
+				ModeType:  1,
392
+				Status:    1,
393
+				Ctime:     time.Now().Unix(),
394
+			}
395
+			err := AddPatientOrdModel(&ordmodel)
396
+			fmt.Println("错误是设么",err)
397
+			patientOrdmodel, err := GetPatientOrdModelByLastData(userOrgID)
398
+			conrotation := models.SgjPatientConrotation{
399
+				Images:    "https://images.shengws.com/2124_o_1570607834870.png",
400
+				Sort:      1,
401
+				Modeid:    patientOrdmodel.ID,
402
+				UserOrgId: userOrgID,
403
+				Ctime:     time.Now().Unix(),
404
+			}
405
+			AddConRotation(&conrotation)
406
+
407
+			ordmodelOne := models.PatientOrdmodel{
408
+				Title:     "医院地址",
409
+				UserOrgId: userOrgID,
410
+				Sort:      2,
411
+				ModeType:  2,
412
+				Status:    1,
413
+				Ctime:     time.Now().Unix(),
414
+			}
415
+			AddPatientOrdModel(&ordmodelOne)
416
+			patientOrdmodelOne, err := GetPatientOrdModelByLastData(userOrgID)
417
+			hosaddress := models.SgjPatientHosaddress{
418
+				Title:     "医院地址",
419
+				UserOrgId: userOrgID,
420
+				Address:   "暂无数据",
421
+				Ctime:     time.Now().Unix(),
422
+				Status:    1,
423
+				Modeid:    patientOrdmodelOne.ID,
424
+			}
425
+            AddHosAddress(&hosaddress)
426
+
427
+			ordmodeltwo := models.PatientOrdmodel{
428
+				Title:     "联系方式",
429
+				UserOrgId: userOrgID,
430
+				Sort:      3,
431
+				ModeType:  3,
432
+				Status:    1,
433
+				Ctime:     time.Now().Unix(),
434
+			}
435
+			AddPatientOrdModel(&ordmodeltwo)
436
+			patientOrdmodelTwo, err := GetPatientOrdModelByLastData(userOrgID)
437
+			connectway := models.SgjPatientConnectway{
438
+				Title:     "联系方式",
439
+				UserOrgId: userOrgID,
440
+				Status:    1,
441
+				Ctime:     time.Now().Unix(),
442
+				ModeId:patientOrdmodelTwo.ID,
443
+			}
444
+			AddConnecWay(&connectway)
445
+			connection := models.SgjPatientConnection{
446
+				Title:     "电话",
447
+				Connecway: 1,
448
+				Content:   "暂无数据",
449
+				Status:    1,
450
+				UserOrgId: userOrgID,
451
+			}
452
+			AddConnetion(connection)
453
+
454
+			ordmodelthree:= models.PatientOrdmodel{
455
+				Title:     "工作时间",
456
+				UserOrgId: userOrgID,
457
+				Sort:      4,
458
+				ModeType:  4,
459
+				Status:    1,
460
+				Ctime:     time.Now().Unix(),
461
+			}
462
+			AddPatientOrdModel(&ordmodelthree)
463
+			patientOrdmodelThree, err := GetPatientOrdModelByLastData(userOrgID)
464
+			worktime := models.SgjPatientWorktime{
465
+				Title:     "工作时间",
466
+				UserOrgId: userOrgID,
467
+				Status:    1,
468
+				Ctime:     time.Now().Unix(),
469
+				ModeId:    patientOrdmodelThree.ID,
470
+				Worktime:"暂无数据",
471
+			}
472
+			AddWorkTime(&worktime)
473
+			ordmodelfour:= models.PatientOrdmodel{
474
+				Title:     "乘车方式",
475
+				UserOrgId: userOrgID,
476
+				Sort:      5,
477
+				ModeType:  5,
478
+				Status:    1,
479
+				Ctime:     time.Now().Unix(),
480
+			}
481
+			AddPatientOrdModel(&ordmodelfour)
482
+			patientOrdmodelfour, err := GetPatientOrdModelByLastData(userOrgID)
483
+			rideway := models.SgjPatientRideway{
484
+				Title:     "乘车方式",
485
+				UserOrgId: userOrgID,
486
+				Status:    1,
487
+				Ctime:     time.Now().Unix(),
488
+				ModeId:    patientOrdmodelfour.ID,
489
+				RideWay:   "暂无数据",
490
+			}
491
+			AddRideWay(rideway)
492
+		}
493
+	}
494
+
495
+
496
+}
497
+
498
+
499
+
11 500
 func AddPatientModel(model *models.SgjPatientModel)error{
12 501
 	err := service.PatientWriteDB().Create(&model).Error
13 502
 	fmt.Println("插入错误",err)
@@ -194,7 +683,7 @@ func UpdateOrdeModel(id int64,orgID int64,ordmodel models.SgjPatientOrdmodel) er
194 683
 }
195 684
 
196 685
 func UpdateRideWay(id int64,orgID int64,rideway models.SgjPatientRideway) error {
197
-	err := service.PatientWriteDB().Model(rideway).Where("id = ? AND user_org_id = ? AND status =?", id, orgID, 1).Update(map[string]interface{}{"title": rideway.Title, "sort": rideway.Sort, "rideway": rideway.RideWay, "mtime": time.Now().Unix()}).Error
686
+	err := service.PatientWriteDB().Model(rideway).Where("id = ? AND user_org_id = ? AND status =?", id, orgID, 1).Update(map[string]interface{}{"title": rideway.Title, "sort": rideway.Sort, "ride_way": rideway.RideWay, "mtime": time.Now().Unix()}).Error
198 687
 	return  err
199 688
 }
200 689
 
@@ -441,6 +930,10 @@ func AddOrdModel(ordmodel *models.SgjPatientOrdmodel)error  {
441 930
 	err := service.PatientWriteDB().Create(&ordmodel).Error
442 931
 	return err
443 932
 }
933
+func AddPatientOrdModel(ordmodel *models.PatientOrdmodel) error {
934
+	err := service.PatientWriteDB().Create(&ordmodel).Error
935
+	return  err
936
+}
444 937
 
445 938
 func AddHosAddress(hosaddress *models.SgjPatientHosaddress) error  {
446 939
 
@@ -786,7 +1279,7 @@ func GetArticlelist(orgid int64)(models.SgjPatientArticlelist,error)  {
786 1279
 }
787 1280
 
788 1281
 func GetAllArticles(orgid int64,limit int64)(articlelist []models.Articles,err error)  {
789
-	err = service.PatientReadDB().Model(articlelist).Where("user_org_id = ? AND Status = ?", orgid, 1).Limit(limit).Find(&articlelist).Error
1282
+	err = service.PatientReadDB().Model(articlelist).Where("user_org_id = ? AND Status = ? AND article_status = ?", orgid, 1,1).Order("ctime desc").Limit(limit).Find(&articlelist).Error
790 1283
 	return
791 1284
 }
792 1285
 
@@ -1047,7 +1540,7 @@ func AddActicles(articles *models.Articles)error  {
1047 1540
 
1048 1541
 func UpdateLinkAddress(id int64,orgid int64,magiclink models.SgjPatientMagiclink)error  {
1049 1542
 
1050
-	err := service.PatientWriteDB().Model(&models.SgjPatientMagiclink{}).Where("id = ? AND user_org_id = ? ", id, orgid).Update(map[string]interface{}{"linktype": magiclink.Linktype, "instationlink": magiclink.Instationlink, "articetype": magiclink.Articetype, "phone": magiclink.Phone, "outstationlink": magiclink.Outstationlink, "linkaddress": magiclink.Linkaddress, "title": magiclink.Title, "mtime": time.Now().Unix()}).Error
1543
+	err := service.PatientWriteDB().Model(&models.SgjPatientMagiclink{}).Where("id = ? AND user_org_id = ? ", id, orgid).Update(map[string]interface{}{"linktype": magiclink.Linktype, "instationlink": magiclink.Instationlink,  "phone": magiclink.Phone, "outstationlink": magiclink.Outstationlink, "linkaddress": magiclink.Linkaddress,  "mtime": time.Now().Unix()}).Error
1051 1544
 	return err
1052 1545
 }
1053 1546
 
@@ -1300,3 +1793,42 @@ func UpdatedRotationVisble(id int64,orgid int64,linkaddress models.SgjPatientLin
1300 1793
 	return err
1301 1794
 }
1302 1795
 
1796
+func GetAritclesData(orgid int64)(articles []models.Articles,err error)  {
1797
+
1798
+	err = service.PatientReadDB().Model(&articles).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&articles).Error
1799
+
1800
+	return articles,err
1801
+
1802
+}
1803
+
1804
+func GetArititys(orgid int64)(activity []models.Activity,err error)  {
1805
+
1806
+	err = service.PatientReadDB().Model(&activity).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&activity).Error
1807
+
1808
+	return activity,err
1809
+}
1810
+
1811
+func AddActivitys(activity *models.Activity) error {
1812
+
1813
+	err := service.PatientReadDB().Create(&activity).Error
1814
+	return err
1815
+}
1816
+
1817
+func GetContactUsModel(orgid int64)(oldmodels []models.PatientOrdmodel,err error)  {
1818
+
1819
+	err = service.PatientReadDB().Model(&oldmodels).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&oldmodels).Error
1820
+	return  oldmodels,err
1821
+}
1822
+
1823
+func GetPatientOrdModelByLastData(orgid int64)(models.PatientOrdmodel,error)  {
1824
+
1825
+	ordmodel := models.PatientOrdmodel{}
1826
+	err := service.PatientReadDB().Model(&ordmodel).Where("user_org_id = ? AND status = ?", orgid, 1).Last(&ordmodel).Error
1827
+	return ordmodel,err
1828
+}
1829
+
1830
+func AddConRotation(conrotation *models.SgjPatientConrotation) error {
1831
+
1832
+	err := service.PatientWriteDB().Create(&conrotation).Error
1833
+	return err
1834
+}