接口编写

src/main/resources/application-dev.yml

@@ -4,9 +4,11 @@ spring:
     password: Test123!
     url: jdbc:mysql://${MYSQL_HOST:116.63.67.122}:${MYSQL_PORT:3306}/${MYSQL_DB:slm_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
 dc_client:
-  host: http://localhost:2400/dc
-  interfaces:
-    getOfficeIds: /bi/{appId}/panel-tree
-    positionListUrl: /{appId}/positions?positionName={positionName}
-    deptListUrl: /{appId}/departments?deptName={deptName}
-    userTree : /{appId}/users/list?userName={userName}
+  host: http://apidev.sycdev.com/dc
+    interfaces:
+      positionListUrl: /{appId}/positions?positionName={positionName}
+      deptListUrl: /{appId}/departments?deptName={deptName}
+      userTree: /{appId}/users/list?userName={userName}
+      variableList: /{appId}/variables/slm/tag/list?token={token}&from={from}&varType={varType}&type={type}&equipmentId={equipmentId}&customerId={customerId}&name={name}&desc={desc}&unit={unit}&keyword={keyword}&isCustomer={isCustomer}&current={current}&size={size}
\ No newline at end of file
+      deviceList: /{appId}/variables/device?token={token}&equipment_info_id={equipment_info_id}&q_name={q_name}&search_code={search_code}&warranty_status={warranty_status}&page_num={page_num}&page_size={page_size}
+      deptsRoles: /{appId}/users/depts-roles
\ No newline at end of file

src/main/resources/application-local.yml

@@ -6,7 +6,9 @@ spring:
 dc_client:
   host: http://localhost:2400/dc
   interfaces:
-    getOfficeIds: /bi/{appId}/panel-tree
     positionListUrl: /{appId}/positions?positionName={positionName}
     deptListUrl: /{appId}/departments?deptName={deptName}
-    userTree : /{appId}/users/list?userName={userName}
+    userTree : /{appId}/users/list?userName={userName}
\ No newline at end of file
+    variableList : /{appId}/variables/slm/tag/list?token={token}&from={from}&varType={varType}&type={type}&equipmentId={equipmentId}&customerId={customerId}&name={name}&desc={desc}&unit={unit}&keyword={keyword}&isCustomer={isCustomer}&current={current}&size={size}
+    deviceList : /{appId}/variables/device?token={token}&equipment_info_id={equipment_info_id}&q_name={q_name}&search_code={search_code}&warranty_status={warranty_status}&page_num={page_num}&page_size={page_size}
+    deptsRoles : /{appId}/users/depts-roles
\ No newline at end of file

src/main/resources/mapper/mysql/panel/InstrumentPanelMapper.xml

@@ -37,7 +37,7 @@
           p.name,
           p.group_id,
           g.name group_name,
-          p.published,
+          if(p.published='published','已发布','未发布') published,
           p.creator_name,
           p.updater_name,
           p.update_time