微网站

.idea/workspace.xml

@@ -4,20 +4,13 @@
     <list default="true" id="b2adb873-ba08-458c-9357-4c6584e112eb" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/conf/app.conf" beforeDir="false" afterPath="$PROJECT_DIR$/conf/app.conf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/controllers/global/open_wechat_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/global/open_wechat_controller.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/controllers/members/members_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/members/members_controller.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/controllers/mpwechat/mpwechat_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/mpwechat/mpwechat_controller.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controllers/article/article_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/article/article_controller.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controllers/micro/micro_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/micro/micro_controller.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/controllers/site/site_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/site/site_controller.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jobcron/open_wechat_job.go" beforeDir="false" afterPath="$PROJECT_DIR$/jobcron/open_wechat_job.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/activity_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/activity_models.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/models/site_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/site_models.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/user_customer_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/user_customer_models.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/routers/router.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/router.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/member_service/member_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/member_service/member_service.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/redis.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/redis.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/article_service/article_category_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/article_service/article_category_service.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/micro_service/micro_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/micro_service/micro_service.go" afterDir="false" />
       <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" />
-      <change beforePath="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -31,35 +24,41 @@
       <file leaf-file-name="app.conf" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/conf/app.conf">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="44">
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+            <state relative-caret-position="154">
+              <caret line="7" selection-start-line="7" selection-end-line="7" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
+      <file leaf-file-name="site_models.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/models/site_models.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-4633">
-              <caret line="4055" column="55" selection-start-line="4055" selection-start-column="37" selection-end-line="4055" selection-end-column="55" />
+            <state relative-caret-position="396">
+              <caret line="476" column="52" selection-start-line="476" selection-start-column="39" selection-end-line="476" selection-end-column="52" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="site_microwebsite_service.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
+      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="766" column="5" selection-start-line="766" selection-start-column="5" selection-end-line="766" selection-end-column="5" />
+            <state relative-caret-position="295">
+              <caret line="5603" column="18" selection-start-line="5603" selection-start-column="9" selection-end-line="5603" selection-end-column="18" />
+              <folding>
+                <element signature="e#14#224#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="activity_models.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/models/activity_models.go">
+      <file leaf-file-name="site_microwebsite_service.go" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="660">
-              <caret line="30" column="95" selection-start-line="30" selection-start-column="95" selection-end-line="30" selection-end-column="95" />
+            <state relative-caret-position="258">
+              <caret line="1217" column="24" selection-start-line="1217" selection-start-column="24" selection-end-line="1217" selection-end-column="24" />
+              <folding>
+                <element signature="e#22#104#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -67,8 +66,8 @@
       <file leaf-file-name="micro_service.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="156">
-              <caret line="50" column="26" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="26" />
+            <state relative-caret-position="88">
+              <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
             </state>
           </provider>
         </entry>
@@ -76,8 +75,8 @@
       <file leaf-file-name="micro_controller.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="172">
-              <caret line="187" column="42" selection-start-line="187" selection-start-column="42" selection-end-line="187" selection-end-column="42" />
+            <state relative-caret-position="145">
+              <caret line="46" column="39" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="39" />
             </state>
           </provider>
         </entry>
@@ -93,23 +92,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>SaveNavigation</find>
-      <find>GetNavigationset</find>
-      <find>/api/staff/getAllStaffInfo</find>
-      <find>GetAllStaffInfo</find>
-      <find>/api/site/getordermodel</find>
-      <find>GetOrderModel</find>
-      <find>GetOrderData</find>
-      <find>GetAllConnecway</find>
-      <find>AddMagiclinkData</find>
-      <find>GetDatatwo</find>
-      <find>AddArticelist</find>
-      <find>GetDoctorDetail</find>
-      <find>GetDoctorInfo</find>
-      <find>GetActivitiesListDetail</find>
-      <find>limit</find>
-      <find>GetAllActivities</find>
-      <find>DeleteRotations</find>
       <find>DeleteSingleImages</find>
       <find>magiclink</find>
       <find>UpdateLinkAddress</find>
@@ -119,10 +101,27 @@
       <find>GetActivities</find>
       <find>/api/site/getactivities</find>
       <find>GetArticlistDetail</find>
-      <find>GetArticlelist</find>
       <find>GetAllArticles</find>
       <find>GetActivitesDetail</find>
       <find>webim登录成功</find>
+      <find>GetArticlelist</find>
+      <find>GetAllComment</find>
+      <find>GetReplyAllComents</find>
+      <find>/api/site/addlinkaddress</find>
+      <find>AddRotaionChart</find>
+      <find>/api/site/singledoctorinfo</find>
+      <find>GetDoctorInfo</find>
+      <find>AddImageslink</find>
+      <find>AddLinkAddressThree</find>
+      <find>AddLinkAddress</find>
+      <find>UpdateSingleForm</find>
+      <find>AddLinkAddressFour</find>
+      <find>AddEditPicForm</find>
+      <find>AddMagiclinkData</find>
+      <find>GetRotationLinkAddress</find>
+      <find>/api/site/addlinkaddresstwo</find>
+      <find>GetData</find>
+      <find>AddMagicNavi</find>
     </findStrings>
   </component>
   <component name="GOROOT" path="C:\Go" />
@@ -140,20 +139,21 @@
         <option value="$PROJECT_DIR$/service/redis.go" />
         <option value="$PROJECT_DIR$/jobcron/open_wechat_job.go" />
         <option value="$PROJECT_DIR$/controllers/global/open_wechat_controller.go" />
-        <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
         <option value="$PROJECT_DIR$/controllers/micro/router_collector.go" />
         <option value="$PROJECT_DIR$/controllers/members/members_controller.go" />
         <option value="$PROJECT_DIR$/models/user_customer_models.go" />
         <option value="$PROJECT_DIR$/service/member_service/member_service.go" />
-        <option value="$PROJECT_DIR$/models/site_models.go" />
         <option value="$PROJECT_DIR$/routers/router.go" />
         <option value="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" />
         <option value="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" />
         <option value="$PROJECT_DIR$/models/activity_models.go" />
-        <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
-        <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
-        <option value="$PROJECT_DIR$/service/micro_service/micro_service.go" />
+        <option value="$PROJECT_DIR$/controllers/article/article_controller.go" />
+        <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
+        <option value="$PROJECT_DIR$/models/site_models.go" />
         <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
+        <option value="$PROJECT_DIR$/service/micro_service/micro_service.go" />
+        <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
+        <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
         <option value="$PROJECT_DIR$/conf/app.conf" />
       </list>
     </option>
@@ -174,6 +174,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -195,13 +196,7 @@
               <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
               <item name="SCRM" type="462c0819:PsiDirectoryNode" />
               <item name="controllers" type="462c0819:PsiDirectoryNode" />
-              <item name="micro" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
-              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
-              <item name="site" type="462c0819:PsiDirectoryNode" />
+              <item name="article" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
@@ -223,11 +218,11 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="DefaultGoTemplateProperty" value="Go Application" />
+    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/goyard/src/SCRM/conf/app.conf" />
     <property name="configurable.Global.GOPATH.is.expanded" value="true" />
     <property name="configurable.Project.GOPATH.is.expanded" value="true" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
@@ -257,16 +252,15 @@
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.81006867" visible="true" weight="0.33981234" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.81006867" visible="true" weight="0.19571045" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.22319035" side_tool="true" visible="true" weight="0.4550642" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.14745308" side_tool="true" visible="true" weight="0.12125535" />
       <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="9" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info id="Structure" order="1" sideWeight="0.18993135" side_tool="true" weight="0.288874" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.77680963" visible="true" weight="0.4550642" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.85254693" visible="true" weight="0.12125535" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -275,6 +269,7 @@
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -457,13 +452,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-797">
-          <caret line="192" column="10" selection-start-line="192" selection-start-column="10" selection-end-line="192" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/controllers/global/open_wechat_controller.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="23">
@@ -478,11 +466,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-792" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/service/db.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1122">
@@ -595,52 +578,72 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/models/site_models.go">
+    <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="197">
+          <caret line="310" column="110" selection-start-line="310" selection-start-column="99" selection-end-line="310" selection-end-column="110" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5874">
-          <caret line="267" column="67" selection-start-line="267" selection-start-column="4" selection-end-line="267" selection-end-column="67" />
+        <state relative-caret-position="-193">
+          <caret line="1181" column="61" selection-start-line="1181" selection-start-column="43" selection-end-line="1181" selection-end-column="61" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/models/activity_models.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="660">
+        <state relative-caret-position="-775">
           <caret line="30" column="95" selection-start-line="30" selection-start-column="95" selection-end-line="30" selection-end-column="95" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
+    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="766" column="5" selection-start-line="766" selection-start-column="5" selection-end-line="766" selection-end-column="5" />
+        <state relative-caret-position="88">
+          <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
+    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4633">
-          <caret line="4055" column="55" selection-start-line="4055" selection-start-column="37" selection-end-line="4055" selection-end-column="55" />
+        <state relative-caret-position="145">
+          <caret line="46" column="39" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
+    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="156">
-          <caret line="50" column="26" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="26" />
+        <state relative-caret-position="258">
+          <caret line="1217" column="24" selection-start-line="1217" selection-start-column="24" selection-end-line="1217" selection-end-column="24" />
+          <folding>
+            <element signature="e#22#104#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
+    <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="5603" column="18" selection-start-line="5603" selection-start-column="9" selection-end-line="5603" selection-end-column="18" />
+          <folding>
+            <element signature="e#14#224#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/models/site_models.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="187" column="42" selection-start-line="187" selection-start-column="42" selection-end-line="187" selection-end-column="42" />
+        <state relative-caret-position="396">
+          <caret line="476" column="52" selection-start-line="476" selection-start-column="39" selection-end-line="476" selection-end-column="52" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/conf/app.conf">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        <state relative-caret-position="154">
+          <caret line="7" selection-start-line="7" selection-end-line="7" />
         </state>
       </provider>
     </entry>

conf/app.conf

@@ -1,6 +1,6 @@
 appname = SCRM
-httpport = 9534
-runmode = dev
+httpport = 9535
+runmode =  dev
 
 copyrequestbody = true
 sessionon = true

controllers/article/article_controller.go

@@ -1085,6 +1085,7 @@ func  (this * ArticleManage) GetAllComment()  {
 	}
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("文章评论机构id",userOrgID)
 	articles, total, err := article_service.GetAllComment(page, limit, userOrgID)
 	fmt.Println("文章内容",articles)
 	if err !=nil{
@@ -1178,7 +1179,7 @@ func (this * ArticleManage) GetReplyAllComents()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
 	fmt.Println("机构ID",userOrgID)
-	comment, total, err := article_service.GetReplyAllComents(page, limit)
+	comment, total, err := article_service.GetReplyAllComents(userOrgID,page, limit)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取评论列表失败")
 		return

controllers/micro/micro_controller.go

@@ -23,7 +23,7 @@ func microRouters(){
 	beego.Router("/api/site/singleactivitinfo",&Micro{},"Get:GetActivitDetail")
 	beego.Router("/api/site/singlearticleinfo",&Micro{},"Get:GetArticlesDetail")
    beego.Router("/api/site/singledoctorinfo",&Micro{},"Get:GetDoctorInfo")
-
+   beego.Router("/api/site/getrotationlinkaddress",&Micro{},"Get:GetRotationLinkAddress")
 }
 
 type Micro struct {
@@ -273,6 +273,8 @@ func (this *Micro) GetDoctorInfo()  {
 	orgid, _ := this.GetInt64("orgid")
 	fmt.Println("机构id",orgid)
 	editdoctor, err := micro_service.GetDoctorInfo(id, orgid)
+	fmt.Println("错误",err)
+	fmt.Println("editdoctor",editdoctor)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
 		return
@@ -280,4 +282,20 @@ func (this *Micro) GetDoctorInfo()  {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"editdoctor":editdoctor,
 	})
+}
+
+func (this *Micro) GetRotationLinkAddress()  {
+	linkid, _ := this.GetInt64("linkid")
+	fmt.Println("linkid",linkid)
+	orgid, _ := this.GetInt64("orgid")
+	fmt.Println("机构id",orgid)
+	linkaddress, err := micro_service.GetRotationLinkAddress(orgid, linkid)
+	fmt.Println("错误是什么",err)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"linkaddress":linkaddress,
+	})
 }

controllers/site/site_controller.go

@@ -125,7 +125,7 @@ func siteRouters() {
 	beego.Router("/api/site/deleteofficebyid",&Microwebsite{},"Post:DeleteOfficeById")
 	beego.Router("/api/site/getarticlebyid",&Microwebsite{},"Get:GetArticleById")
 	beego.Router("/api/site/getallactivity",&Microwebsite{},"Get:GetAllActivity")
-	beego.Router("/api/site/addlinkaddress",&Microwebsite{},"Post:AddLinkAddress")
+	beego.Router("/api/site/addlinkaddresstwo",&Microwebsite{},"Post:AddData")
 	beego.Router("/api/site/getlinkaddress",&Microwebsite{},"Get:Getlinkaddress")
 	beego.Router("/api/site/getallconnecway",&Microwebsite{},"Get:GetAllConnecway")
 	beego.Router("/api/site/getconnecway",&Microwebsite{},"Get:GetConnecway")
@@ -166,7 +166,11 @@ func siteRouters() {
 	beego.Router("/api/site/getdoctordetail",&Microwebsite{},"Get:GetDoctorDetailInfo")
 	beego.Router("/api/site/getArticlelistdetail",&Microwebsite{},"Get:GetArticleListDetail")
 	beego.Router("/api/site/getActivitieslistinfo",&Microwebsite{},"Get:GetActivitiesListDetail")
-
+	beego.Router("/api/site/addlinkaddressthree",&Microwebsite{},"Post:AddLinkAddressThree")
+	beego.Router("/api/getlinkaddressbylinkid",&Microwebsite{},"Get:GetLinkAddressByLinkId")
+	beego.Router("/api/site/addlinkaddressfour",&Microwebsite{},"Post:AddLinkAddressFour")
+    beego.Router("/api/site/getmaginclinkaddressbyid",&Microwebsite{},"Get:GetMagicLinkAddressById")
+	beego.Router("/api.site/getmagicclickbylinkid",&Microwebsite{},"Get:GetMagicClickByLinkID")
 }
 
 type Microwebsite struct {
@@ -245,7 +249,8 @@ func (this *Microwebsite) AddRotaionChart()  {
 	}
 	err = site_service.UpdateEditpicLink(userOrgID, ids, editpiclink)
 	fmt.Println("添加错误是设么",err)
-	site_service.AddRotation(rotation)
+	addRotation := site_service.AddRotation(rotation)
+	fmt.Println("addRotation",addRotation)
 	patientRotation, err := site_service.GetRotationByLastData(userOrgID)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加医院失败")
@@ -2930,8 +2935,7 @@ func (this *Microwebsite) AddMagicNavi()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := int64(adminUserInfo.CurrentOrgId)
 	fmt.Println("这个是",userOrgID)
-	id, _ := this.GetInt64("id")
-	fmt.Println("id是多少",id)
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -2939,6 +2943,8 @@ func (this *Microwebsite) AddMagicNavi()  {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
 		return
 	}
+	linkid := int64(dataBody["linkid"].(float64))
+    fmt.Println("linkid是多少",linkid)
 	margtitle := dataBody["margtitle"].(string)
 	fmt.Println("导航标题",margtitle)
 	if len(margtitle) == 0 {
@@ -2974,7 +2980,7 @@ func (this *Microwebsite) AddMagicNavi()  {
 		UserOrgId:     userOrgID,
 		ImgShow:1,
 		Modeid:0,
-		Linkid:id,
+		Linkid:linkid,
 	}
 
 	err = site_service.AddMagicNavi(&editmargin)
@@ -3756,12 +3762,13 @@ func (this *Microwebsite) UpdateSingleForm()  {
     linkaddress := dataBody["linkaddress"].(string)
     fmt.Println("链接地址",linkaddress)
 	modelid := int64(dataBody["modeid"].(float64))
-
+	linkid := int64(dataBody["linkid"].(float64))
 	editpiclink := models.SgjPatientEditpiclink{
 		Images:      images,
 		Sort:        sort,
 		Piclink:     piclink,
 		Linkaddress: linkaddress,
+		Linkid:linkid,
 	}
 	err = site_service.UpdateEditPatPicLink(id, userOrgID, editpiclink)
 	fmt.Println("第一个错误是设么",err)
@@ -3800,7 +3807,7 @@ func (this *Microwebsite) AddEditPicForm()  {
 	fmt.Println("图片链接",piclink)
 	linkaddress := dataBody["linkaddress"].(string)
 	fmt.Println("链接地址",linkaddress)
-
+	linkid := int64(dataBody["linkid"].(float64))
 
 	//patientRotation, err := site_service.GetPatientRotationById(id, userOrgID)
 	//fmt.Println("错误",err)
@@ -3815,6 +3822,7 @@ func (this *Microwebsite) AddEditPicForm()  {
 		Status:      1,
 		Modeid:      id,
 		ImgShow:1,
+		Linkid:linkid,
 	}
 	err = site_service.AddImageslink(&editpiclink)
 	editpiclinks, err := site_service.GetPicImages(userOrgID, id)
@@ -4030,7 +4038,7 @@ func (this *Microwebsite) AddArticelist()  {
 func (this *Microwebsite) GetArticlelist()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := int64(adminUserInfo.CurrentOrgId)
-	fmt.Println("机构id",userOrgID)
+	fmt.Println("文章机构id",userOrgID)
 	articlelist, err := site_service.GetArticlelist(userOrgID)
 	fmt.Println("articlelist",articlelist)
 	fmt.Println("错误",err)
@@ -4347,57 +4355,31 @@ func (this *Microwebsite) GetAllActivity()  {
 		"activtity":activtity,
 	})
 }
-
-func (this *Microwebsite) AddLinkAddress()  {
+func (this *Microwebsite) AddData()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
 	fmt.Println("机构id",userOrgID)
-	dataBody := make(map[string]interface{}, 0)
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
-		return
-	}
-	addtype := int64(dataBody["addtype"].(float64))
-	fmt.Println("链接内型",addtype)
-	connectType := int64(dataBody["connectType"].(float64))
-	fmt.Println("链接类型2",connectType)
-	contentType := int64(dataBody["contenttype"].(float64))
-	fmt.Println("链接类型3",contentType)
-    linktype := int64(dataBody["linkType"].(float64))
-    fmt.Println("链接类型4",linktype)
-	linkaddress := dataBody["linkaddress"].(string)
-	fmt.Println("链接类型5",linkaddress)
-	defineAddress := dataBody["defineAddress"].(string)
-	if(defineAddress != ""){
-		linkaddress = defineAddress;
-	}
-	fmt.Println("自定义链接地址",defineAddress)
+
+	defineaddress := this.GetString("address")
+	fmt.Println("站位地址",defineaddress)
 	patientLinkaddress := models.SgjPatientLinkaddress{
+		Defineaddress: defineaddress,
 		UserOrgId:     userOrgID,
-		Addtype:       addtype,
-		Connecttype:   connectType,
-		Linktype:      linktype,
-		Contenttype:   connectType,
-		Linkaddress:   linkaddress,
-		Defineaddress: defineAddress,
+		Status:        1,
 		Ctime:         time.Now().Unix(),
-		Status:1,
 	}
-	err = site_service.AddLinkAddress(&patientLinkaddress)
-	sgjPatientLinkaddress, err := site_service.GetLinkAddress(userOrgID)
-	address, err := site_service.QuerylinkAddress(sgjPatientLinkaddress.ID, sgjPatientLinkaddress.UserOrgId)
+	err := site_service.AddLinkAddress(&patientLinkaddress)
+	fmt.Println("错误是设么",err)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"patientLinkaddress":patientLinkaddress,
-		"address":address,
 	})
 }
 
+
 func  (this *Microwebsite) Getlinkaddress()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
@@ -5523,4 +5505,102 @@ func (this *Microwebsite)  GetActivitiesListDetail()  {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"activity":activity,
 	})
+}
+
+func (this *Microwebsite) AddLinkAddressThree()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id",userOrgID)
+	defineaddress := this.GetString("address")
+	fmt.Println("自定义地址",defineaddress)
+	if len(defineaddress) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "自定义地址不能为空")
+		return
+	}
+	patientLinkaddress := models.SgjPatientLinkaddress{
+		Defineaddress: defineaddress,
+		UserOrgId:userOrgID,
+		Status:1,
+		Ctime:time.Now().Unix(),
+	}
+	err := site_service.AddLinkAddress(&patientLinkaddress)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patientLinkaddress":patientLinkaddress,
+	})
+}
+
+func (this *Microwebsite) GetLinkAddressByLinkId()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id",userOrgID)
+	linkid, _ := this.GetInt64("linkid")
+	fmt.Println("linkid是多少?",linkid)
+	linkaddress, err := site_service.GetLinkAddressByLinkId(userOrgID, linkid)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"linkaddress":linkaddress,
+	})
+}
+
+func (this *Microwebsite) AddLinkAddressFour()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id",userOrgID)
+	address := this.GetString("address")
+	fmt.Println("linkid是多少?",address)
+	linkaddress := models.SgjPatientLinkaddress{
+		Defineaddress: address,
+		Status:        1,
+		Ctime:         time.Now().Unix(),
+		UserOrgId:     userOrgID,
+	}
+
+	err := site_service.AddLinkAddress(&linkaddress)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"linkaddress":linkaddress,
+	})
+}
+
+func (this *Microwebsite) GetMagicLinkAddressById()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id",userOrgID)
+	id, _:= this.GetInt64("id")
+	fmt.Println("id是多少",id)
+	magiclink, err := site_service.GetMagicLinkAddressById(userOrgID, id)
+	fmt.Println("错误是什么",err)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"magiclink":magiclink,
+	})
+}
+
+func (this *Microwebsite) GetMagicClickByLinkID()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id",userOrgID)
+	linkid, _:= this.GetInt64("linkid")
+	fmt.Println("id是多少",linkid)
+	magiclink, err := site_service.GetMagicClickByLinkID(userOrgID, linkid)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"magiclink":magiclink,
+	})
 }

models/site_models.go

@@ -474,16 +474,11 @@ func (SgjPatientArticlelist)TableName() string {
 
 type SgjPatientLinkaddress struct {
 	ID int64 `gorm:"column:id" json:"id" form:"id"`
-	Addtype int64 `gorm:"column:addtype" json:"addtype" form:"addtype"`
-	Connecttype int64 `gorm:"column:connecttype" json:"connecttype" form:"connecttype"`
-	Linktype int64 `gorm:"column:linktype" json:"linktype" form:"linktype"`
-	Linkaddress string `gorm:"column:linkaddress" json:"linkaddress" form:"linkaddress"`
 	Defineaddress string `gorm:"column:defineaddress" json:"defineaddress" form:"defineaddress"`
 	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	Status int64 `gorm:"column:status" json:"status" form:"status"`
 	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Contenttype int64 `gorm:"column:contenttype" json:"contenttype" form:"contenttype"`
 }
 
 func (SgjPatientLinkaddress)TableName() string {

service/article_service/article_category_service.go

@@ -307,8 +307,8 @@ func AddComment(comment *models.Comment)(error)  {
 	return  err
 }
 
-func GetReplyAllComents(page int64,limit int64)(comment []*models.Comment,total int64,err error)  {
-	db := service.PatientReadDB().Table("sgj_patient_articles_comment as a").Where("a.status = 1")
+func GetReplyAllComents(orgid int64,page int64,limit int64)(comment []*models.Comment,total int64,err error)  {
+	db := service.PatientReadDB().Table("sgj_patient_articles_comment as a").Where("a.status = ?,a.user_org_id = ?",1,orgid)
 	offset := (page - 1) * limit
 	err = db.Where("parent_id = ?",0).Count(&total).Order("a.ctime desc").Offset(offset).Limit(limit).
 		Select("a.id,a.article_id,a.comment_user_id,a.parent_id,a.content,a.ctime,a.status,a.star_num,a.comment_num,a.comment_id,a.comment_user_name,a.comment_user_avater,a.source,a.ttid,a.tuser_id,a.taid,a.tpid,a.tcid").Find(&comment).Error

service/micro_service/micro_service.go

@@ -140,4 +140,10 @@ func GetDoctorInfo(id int64,orgid int64)(models.SgjPatientEditdoctor,error)  {
 	editdoctor := models.SgjPatientEditdoctor{}
 	err := service.PatientReadDB().Model(&editdoctor).Where("id = ? AND user_org_id = ?", id, orgid).Find(&editdoctor).Error
 	return editdoctor,err
+}
+
+func GetRotationLinkAddress(orgid int64,linkid int64)(models.SgjPatientLinkaddress,error)  {
+	linkaddress := models.SgjPatientLinkaddress{}
+	err := service.PatientReadDB().Model(&linkaddress).Where("user_org_id = ? AND id = ? AND status = ?", orgid, linkid, 1).Find(&linkaddress).Error
+	return linkaddress,err
 }

service/site_service/site_microwebsite_service.go

@@ -703,7 +703,7 @@ func GetQueryEditpiclink(modeid int64,orgid int64)(editpiclink []models.SgjPatie
 
 func UpdateEditPatPicLink(id int64,orgid int64,editpiclink models.SgjPatientEditpiclink)(error)  {
 
-	err := service.PatientWriteDB().Model(editpiclink).Where("id = ? AND user_org_id =? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"images": editpiclink.Images, "sort": editpiclink.Sort, "piclink": editpiclink.Piclink, "linkaddress": editpiclink.Linkaddress, "mtime": time.Now().Unix()}).Error
+	err := service.PatientWriteDB().Model(editpiclink).Where("id = ? AND user_org_id =? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"images": editpiclink.Images, "sort": editpiclink.Sort, "piclink": editpiclink.Piclink, "linkaddress": editpiclink.Linkaddress,"linkid":editpiclink.Linkid, "mtime": time.Now().Unix()}).Error
 	return  err
 }
 
@@ -858,7 +858,12 @@ func GetAllActivity(orgid int64)(activtity []models.Activity,err error)  {
 	return
 }
 
-func AddLinkAddress(linkaddress *models.SgjPatientLinkaddress) error {
+//func AddLinkAddress(linkaddress *models.SgjPatientLinkaddress) error {
+//	err := service.PatientWriteDB().Create(&linkaddress).Error
+//	return err
+//}
+
+func AddLinkAddress(linkaddress *models.SgjPatientLinkaddress)  error {
 	err := service.PatientWriteDB().Create(&linkaddress).Error
 	return err
 }
@@ -1193,4 +1198,22 @@ func GetActivitiesListDetail(id int64,orgid int64)(models.Activity,error)  {
 	activity := models.Activity{}
 	err := service.PatientReadDB().Model(&activity).Where("id=? AND user_org_id = ?", id, orgid).Find(&activity).Error
 	return activity,err
+}
+
+func GetLinkAddressByLinkId(orgid int64,linkid int64)(models.SgjPatientLinkaddress,error)  {
+	linkaddress := models.SgjPatientLinkaddress{}
+	err := service.PatientReadDB().Model(&linkaddress).Where("user_org_id = ? AND id = ? AND  status = ?", orgid, linkid, 1).Find(&linkaddress).Error
+	return linkaddress,err
+}
+
+func GetMagicLinkAddressById(orgid int64,linkid int64)(models.SgjPatientMagiclink,error)  {
+	magiclink := models.SgjPatientMagiclink{}
+	err := service.PatientReadDB().Model(&magiclink).Where("user_org_id = ? AND id = ? AND status = ?", orgid, linkid, 1).Find(&magiclink).Error
+	return magiclink,err
+}
+
+func GetMagicClickByLinkID(orgid int64,linkid int64)(models.SgjPatientMagiclink,error)  {
+	magiclink := models.SgjPatientMagiclink{}
+	err := service.PatientReadDB().Model(&magiclink).Where("user_org_id = ? AND id = ? AND status = ?", orgid, linkid, 1).Find(&magiclink).Error
+	return magiclink,err
 }