x

.idea/workspace.xml

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="" />
+    <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/EquipmentController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/EquipmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/EquipmentManageController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/template_service.html" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/template_service.html" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -63,8 +68,8 @@
     <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/shop/static/images" />
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/shop/src/main/resource/mapper" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.zskk.shop.controller.pc" />
@@ -73,8 +78,8 @@
       <recent name="com.zskk.shop.service" />
       <recent name="com.zskk.shop.dao" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/shop/src/main/resource/mapper" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/shop/static/images" />
     </key>
   </component>
   <component name="RunManager">
@@ -203,7 +208,10 @@
       <workItem from="1585628259581" duration="1403000" />
       <workItem from="1585706005737" duration="789000" />
       <workItem from="1585792990603" duration="197000" />
-      <workItem from="1585812151059" duration="3766000" />
+      <workItem from="1585812151059" duration="3965000" />
+      <workItem from="1586242612852" duration="615000" />
+      <workItem from="1586412927695" duration="1670000" />
+      <workItem from="1586416739654" duration="2933000" />
     </task>
     <servers />
   </component>
@@ -215,103 +223,116 @@
       <screen x="0" y="23" width="1440" height="822" />
     </state>
     <state x="184" y="96" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1440.822@0.23.1440.822" timestamp="1584449391479" />
-    <state width="1398" height="380" key="GridCell.Tab.0.bottom" timestamp="1585820461717">
-      <screen x="0" y="23" width="1440" height="823" />
+    <state width="1398" height="381" key="GridCell.Tab.0.bottom" timestamp="1586420003132">
+      <screen x="0" y="23" width="1440" height="825" />
     </state>
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191751" />
-    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461717" />
-    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136936" />
-    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764830" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585825765649" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.823@0.23.1440.823" timestamp="1586264053541" />
+    <state width="1398" height="381" key="GridCell.Tab.0.bottom/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1586420003132" />
+    <state width="1398" height="381" key="GridCell.Tab.0.bottom/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1586418421309" />
     <state width="1398" height="232" key="GridCell.Tab.0.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
-    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
+    <state width="1398" height="381" key="GridCell.Tab.0.bottom/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1586417133261" />
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585568481547" />
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287029" />
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560326117" />
-    <state width="1398" height="380" key="GridCell.Tab.0.center" timestamp="1585820461715">
-      <screen x="0" y="23" width="1440" height="823" />
+    <state width="1398" height="381" key="GridCell.Tab.0.center" timestamp="1586420003131">
+      <screen x="0" y="23" width="1440" height="825" />
     </state>
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191750" />
-    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461715" />
-    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136935" />
-    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764829" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585825765649" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.823@0.23.1440.823" timestamp="1586264053541" />
+    <state width="1398" height="381" key="GridCell.Tab.0.center/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1586420003131" />
+    <state width="1398" height="381" key="GridCell.Tab.0.center/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1586418421308" />
     <state width="1398" height="232" key="GridCell.Tab.0.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
-    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421908" />
+    <state width="1398" height="381" key="GridCell.Tab.0.center/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1586417133260" />
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827@0.23.1440.827" timestamp="1585568481546" />
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287028" />
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
-    <state width="1398" height="380" key="GridCell.Tab.0.left" timestamp="1585820461714">
-      <screen x="0" y="23" width="1440" height="823" />
+    <state width="1398" height="381" key="GridCell.Tab.0.left" timestamp="1586420003131">
+      <screen x="0" y="23" width="1440" height="825" />
     </state>
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191749" />
-    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461714" />
-    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136935" />
-    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764829" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585825765648" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.823@0.23.1440.823" timestamp="1586264053541" />
+    <state width="1398" height="381" key="GridCell.Tab.0.left/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1586420003131" />
+    <state width="1398" height="381" key="GridCell.Tab.0.left/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1586418421308" />
     <state width="1398" height="232" key="GridCell.Tab.0.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
-    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421907" />
+    <state width="1398" height="381" key="GridCell.Tab.0.left/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1586417133260" />
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827@0.23.1440.827" timestamp="1585568481545" />
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287027" />
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
-    <state width="1398" height="380" key="GridCell.Tab.0.right" timestamp="1585820461716">
-      <screen x="0" y="23" width="1440" height="823" />
+    <state width="1398" height="381" key="GridCell.Tab.0.right" timestamp="1586420003132">
+      <screen x="0" y="23" width="1440" height="825" />
     </state>
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191750" />
-    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461716" />
-    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136936" />
-    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764830" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585825765649" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.823@0.23.1440.823" timestamp="1586264053541" />
+    <state width="1398" height="381" key="GridCell.Tab.0.right/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1586420003132" />
+    <state width="1398" height="381" key="GridCell.Tab.0.right/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1586418421309" />
     <state width="1398" height="232" key="GridCell.Tab.0.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
-    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421908" />
+    <state width="1398" height="381" key="GridCell.Tab.0.right/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1586417133261" />
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827@0.23.1440.827" timestamp="1585568481547" />
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287028" />
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.829@0.23.1440.829" timestamp="1585560326116" />
-    <state width="1398" height="380" key="GridCell.Tab.1.bottom" timestamp="1585820461718">
-      <screen x="0" y="23" width="1440" height="823" />
+    <state width="1398" height="381" key="GridCell.Tab.1.bottom" timestamp="1586420003134">
+      <screen x="0" y="23" width="1440" height="825" />
     </state>
-    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461718" />
-    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585825765651" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.823@0.23.1440.823" timestamp="1586264053542" />
+    <state width="1398" height="381" key="GridCell.Tab.1.bottom/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1586420003134" />
+    <state width="1398" height="381" key="GridCell.Tab.1.bottom/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1586418421311" />
     <state width="1398" height="232" key="GridCell.Tab.1.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485991" />
-    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421910" />
+    <state width="1398" height="381" key="GridCell.Tab.1.bottom/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1586417133264" />
     <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585568481549" />
     <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585565681678" />
     <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560326118" />
-    <state width="1398" height="380" key="GridCell.Tab.1.center" timestamp="1585820461718">
-      <screen x="0" y="23" width="1440" height="823" />
+    <state width="1398" height="381" key="GridCell.Tab.1.center" timestamp="1586420003133">
+      <screen x="0" y="23" width="1440" height="825" />
     </state>
-    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461718" />
-    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585825765650" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.823@0.23.1440.823" timestamp="1586264053542" />
+    <state width="1398" height="381" key="GridCell.Tab.1.center/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1586420003133" />
+    <state width="1398" height="381" key="GridCell.Tab.1.center/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1586418421310" />
     <state width="1398" height="232" key="GridCell.Tab.1.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485990" />
-    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
+    <state width="1398" height="381" key="GridCell.Tab.1.center/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1586417133263" />
     <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />
     <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.828@0.23.1440.828" timestamp="1585565681677" />
     <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.829@0.23.1440.829" timestamp="1585560326118" />
-    <state width="1398" height="380" key="GridCell.Tab.1.left" timestamp="1585820461717">
-      <screen x="0" y="23" width="1440" height="823" />
+    <state width="1398" height="381" key="GridCell.Tab.1.left" timestamp="1586420003133">
+      <screen x="0" y="23" width="1440" height="825" />
     </state>
-    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461717" />
-    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585825765650" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.823@0.23.1440.823" timestamp="1586264053542" />
+    <state width="1398" height="381" key="GridCell.Tab.1.left/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1586420003133" />
+    <state width="1398" height="381" key="GridCell.Tab.1.left/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1586418421310" />
     <state width="1398" height="232" key="GridCell.Tab.1.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485990" />
-    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
+    <state width="1398" height="381" key="GridCell.Tab.1.left/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1586417133262" />
     <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />
     <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.828@0.23.1440.828" timestamp="1585565681677" />
     <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.829@0.23.1440.829" timestamp="1585560326117" />
-    <state width="1398" height="380" key="GridCell.Tab.1.right" timestamp="1585820461718">
-      <screen x="0" y="23" width="1440" height="823" />
+    <state width="1398" height="381" key="GridCell.Tab.1.right" timestamp="1586420003134">
+      <screen x="0" y="23" width="1440" height="825" />
     </state>
-    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585820461718" />
-    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585825765650" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.823@0.23.1440.823" timestamp="1586264053542" />
+    <state width="1398" height="381" key="GridCell.Tab.1.right/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1586420003134" />
+    <state width="1398" height="381" key="GridCell.Tab.1.right/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1586418421311" />
     <state width="1398" height="232" key="GridCell.Tab.1.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485991" />
-    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
+    <state width="1398" height="381" key="GridCell.Tab.1.right/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1586417133263" />
     <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />
     <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.828@0.23.1440.828" timestamp="1585565681678" />
     <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.829@0.23.1440.829" timestamp="1585560326118" />
-    <state x="794" y="313" key="com.intellij.ide.util.TipDialog" timestamp="1585706024772">
-      <screen x="0" y="23" width="1440" height="828" />
+    <state x="794" y="312" key="com.intellij.ide.util.TipDialog" timestamp="1586412933957">
+      <screen x="0" y="23" width="1440" height="825" />
     </state>
     <state x="794" y="311" key="com.intellij.ide.util.TipDialog/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585628291708" />
     <state x="794" y="312" key="com.intellij.ide.util.TipDialog/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1584499814791" />
+    <state x="794" y="312" key="com.intellij.ide.util.TipDialog/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1586412933957" />
     <state x="794" y="313" key="com.intellij.ide.util.TipDialog/0.23.1440.827@0.23.1440.827" timestamp="1585568533241" />
     <state x="794" y="313" key="com.intellij.ide.util.TipDialog/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706024772" />
     <state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.829@0.23.1440.829" timestamp="1585363207913" />

shop/src/main/java/com/zskk/shop/controller/admin/EquipmentController.java → shop/src/main/java/com/zskk/shop/controller/admin/EquipmentManageController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 @RequestMapping("/manage/equipment")
-public class EquipmentController extends AbstractController {
+public class EquipmentManageController extends AbstractController {
 
 	@Autowired
 	private EquipmentService equipmentService;

shop/src/main/java/com/zskk/shop/controller/pc/EquipmentController.java

@@ -0,0 +1,62 @@
+/**
+* @版权信息 (@copyright Copyright 2017-XXXX JDJR.COM All Right Reserved);
+* @see
+* @author 于海涛 京东金融【技术研发部-证券及营销平台研发部-营销平台研发部】
+* @version 1.0
+* @date 2018年6月21日
+*/
+
+package com.zskk.shop.controller.pc;
+
+import com.zskk.shop.controller.AbstractController;
+import com.zskk.shop.dao.entry.Equipment;
+import com.zskk.shop.service.EquipmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/equipment")
+public class EquipmentController extends AbstractController {
+	@Autowired
+	private EquipmentService equipmentService;
+
+	@RequestMapping("/list")
+	public String list(Model model) {
+		List<Equipment> equipments = equipmentService.queryAllOnlineEquipments();
+		model.addAttribute("equipments", equipments);
+		this.initUser(model);
+		return "/equipments";
+	}
+
+	@RequestMapping("/detail/{id}")
+	public String info(Model model, @PathVariable("id") Integer id) {
+		Equipment equipment = equipmentService.getOne(id);
+		List<Equipment> equipments = equipmentService.queryAllOnlineEquipments();
+		int next = -1; int pro = -1; int i = 0;
+		if(equipment != null) {
+			while (i < equipments.size()) {
+				if(equipments.get(i).getId().equals(id)) {
+					if(i > 0) {
+						pro = equipments.get(i - 1).getId();
+					}
+					if(i < equipments.size() - 1) {
+						next = equipments.get(i + 1).getId();
+					}
+					break;
+				}
+				i++;
+			}
+		}
+		model.addAttribute("equipments", equipments);
+		model.addAttribute("next", next);
+		model.addAttribute("pro", pro);
+		model.addAttribute("equipment", equipment);
+		this.initUser(model);
+		return "/equipment";
+	}
+}

shop/src/main/resource/templates/equipment.html

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+  <title>Document</title>
+  <link rel="stylesheet" href="/style/specialist.css" />
+  <link rel="stylesheet" href="/style/common.css" />
+  <link rel="stylesheet" href="/style/nHeader.css" />
+  <link rel="stylesheet" href="/style/swiper.min.css" />
+  <link rel="stylesheet" href="/style/smallBanner.css" />
+</head>
+
+<body>
+  <div class="zskk-box">
+    <!-- 首页banner -->
+    <div th:include="/fragments :: header"></div>
+    <div th:replace="/template_banner :: banner"></div>
+
+    <div class="zskk-specialist">
+      <section class="zskk-content">
+        <section class="zskk-specialistInfo">
+          <section class="zskk-personInfo">
+            <div class="zskk-specialistName" th:text="${equipment.name}"></div>
+            <div class="zskk-contentInfo" th:utext="${equipment.html}"></div>
+          </section>
+          <section class="zskk-personList">
+            <section class="zskk-title">
+              服务环境
+            </section>
+            <section class="zskk-recommend">
+              为您推荐
+            </section>
+            <table cellspacing="0" cellpadding="0">
+              <tr th:each="item: ${equipments}">
+                <td >
+                  <a style="text-overflow:ellipsis; white-space: nowrap;" th:text="${item.name}" th:attr="href='/equipment/detail/' + ${item.id}"></a>
+                </td>
+              </tr>
+            </table>
+          </section>
+        </section>
+        <section class="zskk-page">
+
+          <input th:if="${pro} == -1" type="button" disable="true" class="disabled" value="《 上一页" />
+          <a th:attr="href='/equipment/detail/' + ${pro}" th:if="${pro} != -1">
+            <input type="button" value="《 上一页" />
+          </a>
+          <input th:if="${next} == -1" type="button" disable="true" class="disabled" value=" 下一页 》" />
+          <a th:attr="href='/equipment/detail/' + ${next}" th:if="${next} != -1">
+            <input type="button"  value="下一页 》" />
+          </a>
+        </section>
+      </section>
+    </div>
+
+    <!-- 页面底部 -->
+    <div th:replace="/fragments :: footer"></div>
+  </div>
+
+  <!-- <script src="/js/jquery-1.12.4.min.js"></script> -->
+</body>
+
+<script src="/js/swiper.min.js"></script>
+<script>
+  window.onload = function() {
+    var mySwiper = new Swiper('.swiper-container', {
+      loop: true
+    })
+  }
+</script>
+
+</html>

shop/src/main/resource/templates/equipments.html

@@ -0,0 +1,55 @@
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+  <title>Document</title>
+  <!-- <link rel="stylesheet" href="/style/specialist.css" /> -->
+  <link rel="stylesheet" href="/style/common.css" />
+  <link rel="stylesheet" href="/style/nHeader.css" />
+  <link rel="stylesheet" href="/style/doctors.css" />
+  <link rel="stylesheet" href="/style/swiper.min.css" />
+  <link rel="stylesheet" href="/style/smallBanner.css" />
+</head>
+
+<body>
+  <div class="zskk-box">
+    <!-- 首页banner -->
+    <div th:include="/fragments :: header"></div>
+    <div th:replace="/template_banner :: banner"></div>
+
+    <div class="zskk-alldocter">
+      <div class="zskk-listData">
+        <!-- <section class="zskk-title">
+          <span class="zskk-info">专家教授</span>
+          <span class="zskk-select">全部</span>
+        </section> -->
+
+        <section class="zskk-list">
+          <a class="zskk-oneInfo" th:each="equipment: ${equipments}" th:attr="href='/equipment/detail/' + ${equipment.id}">
+            <img th:attr="src=${equipment.icon}" alt="" />
+            <span class="zskk-name" th:text="${equipment.name}"></span>
+            <span class="zskk-position" th:text="${equipment.title}"></span>
+          </a>
+        </section>
+      </div>
+    </div>
+    <!-- 页面底部 -->
+    <div th:replace="/fragments :: footer"></div>
+  </div>
+
+</body>
+
+<script src="/js/swiper.min.js"></script>
+<script>
+  window.onload = function() {
+    var mySwiper = new Swiper('.swiper-container', {
+      loop: true
+    })
+  }
+</script>
+
+</html>

shop/src/main/resource/templates/h5/map.html

@@ -0,0 +1,134 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>无标题文档</title>
+</head>
+
+<body>
+
+<style>
+.zskk_mapTable{ width:900px; margin-top: 100px;}
+.zskk_mapTable td{ border:none; width:450px; }
+</style>
+<table class="zskk_mapTable">
+    <tr>
+        <td>
+        	<!--引用百度地图API-->
+			<style type="text/css">
+                html,body{margin:0;padding:0;}
+                .iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
+                .iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
+            </style>
+            <script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
+            <div style="width:400px;height:250px;border:#ccc solid 1px;" id="dituContent"></div>
+        </td>
+        <td>
+            <p><strong>黑龙江昆仑盛和安体检中心</strong></p>
+            <p>中心地址: 哈尔滨市南岗区学府路239号01号商服(农科院对面)</p>
+            <p>服务电话: 0451-87988777</p>
+        </td>
+    </tr>
+</table>
+
+<script type="text/javascript">
+    //创建和初始化地图函数：
+    function initMap(){
+        createMap();//创建地图
+        setMapEvent();//设置地图事件
+        addMapControl();//向地图添加控件
+        addMarker();//向地图中添加marker
+    }
+    
+    //创建地图函数：
+    function createMap(){
+        var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
+        var point = new BMap.Point(126.624637,45.692069);//定义一个中心点坐标
+        map.centerAndZoom(point,17);//设定地图的中心点和坐标并将地图显示在地图容器中
+        window.map = map;//将map变量存储在全局
+    }
+    
+    //地图事件设置函数：
+    function setMapEvent(){
+        map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
+        map.enableScrollWheelZoom();//启用地图滚轮放大缩小
+        map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
+        map.enableKeyboard();//启用键盘上下左右键移动地图
+    }
+    
+    //地图控件添加函数：
+    function addMapControl(){
+        //向地图中添加缩放控件
+	var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_SMALL});
+	map.addControl(ctrl_nav);
+        //向地图中添加缩略图控件
+	var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:0});
+	map.addControl(ctrl_ove);
+        //向地图中添加比例尺控件
+	var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
+	map.addControl(ctrl_sca);
+    }
+    
+    //标注点数组
+    var markerArr = [{title:"昆仑盛和安体检中心",content:"我的备注",point:"126.624098|45.69188",isOpen:0,icon:{w:21,h:21,l:0,t:0,x:6,lb:5}}
+		 ];
+    //创建marker
+    function addMarker(){
+        for(var i=0;i<markerArr.length;i++){
+            var json = markerArr[i];
+            var p0 = json.point.split("|")[0];
+            var p1 = json.point.split("|")[1];
+            var point = new BMap.Point(p0,p1);
+			var iconImg = createIcon(json.icon);
+            var marker = new BMap.Marker(point,{icon:iconImg});
+			var iw = createInfoWindow(i);
+			var label = new BMap.Label(json.title,{"offset":new BMap.Size(json.icon.lb-json.icon.x+10,-20)});
+			marker.setLabel(label);
+            map.addOverlay(marker);
+            label.setStyle({
+                        borderColor:"#808080",
+                        color:"#333",
+                        cursor:"pointer"
+            });
+			
+			(function(){
+				var index = i;
+				var _iw = createInfoWindow(i);
+				var _marker = marker;
+				_marker.addEventListener("click",function(){
+				    this.openInfoWindow(_iw);
+			    });
+			    _iw.addEventListener("open",function(){
+				    _marker.getLabel().hide();
+			    })
+			    _iw.addEventListener("close",function(){
+				    _marker.getLabel().show();
+			    })
+				label.addEventListener("click",function(){
+				    _marker.openInfoWindow(_iw);
+			    })
+				if(!!json.isOpen){
+					label.hide();
+					_marker.openInfoWindow(_iw);
+				}
+			})()
+        }
+    }
+    //创建InfoWindow
+    function createInfoWindow(i){
+        var json = markerArr[i];
+        var iw = new BMap.InfoWindow("<b class='iw_poi_title' title='" + json.title + "'>" + json.title + "</b><div class='iw_poi_content'>"+json.content+"</div>");
+        return iw;
+    }
+    //创建一个Icon
+    function createIcon(json){
+        var icon = new BMap.Icon("http://app.baidu.com/map/images/us_mk_icon.png", new BMap.Size(json.w,json.h),{imageOffset: new BMap.Size(-json.l,-json.t),infoWindowOffset:new BMap.Size(json.lb+5,1),offset:new BMap.Size(json.x,json.h)})
+        return icon;
+    }
+    
+    initMap();//创建和初始化地图
+</script>
+
+
+</body>
+</html>

shop/src/main/resource/templates/template_service.html

@@ -17,15 +17,14 @@
         <section class="zskk-flowInfo">
           <div class="swiper-service">
             <div class="swiper-wrapper" id="zskk-service">
-              <div class="swiper-slide" th:each="equipment, row: ${equipments}">
-                <div class="title" th:text="${equipment.title}"></div>
-                <img th:attr="src=${equipment.icon}" alt="" />
-              </div>
+              <a class="swiper-slide" th:each="equipment, row: ${equipments}" th:attr="href='/equipment/detail/' + ${equipment.id}">
+                  <div class="title" th:text="${equipment.title}"></div>
+                  <img th:attr="src=${equipment.icon}" alt="" />
+              </a>
             </div>
           </div>
         </section>
       </div>
     </div>
 </body>
-
 </html>