From a42cacf1663d5744bab87fed467d5445d865b7e1 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期二, 07 六月 2022 18:27:41 +0800
Subject: [PATCH] 添加路灯列表接口，在线查询接口，控灯接口
---
src/main/java/api/dao/SinglelampDataDao.java | 3
.idea/jarRepositories.xml | 32 ++--
target/classes/mapper/PoleSinglelampDataMapper.xml | 54 +++-----
.idea/uiDesigner.xml | 54 ++++----
src/main/java/api/bean/SinglelampDataEntity.java | 4
.idea/.gitignore | 2
src/main/java/api/service/SinglelampDataServer.java | 5
.idea/misc.xml | 8 +
/dev/null | 56 ---------
src/main/resources/mapper/PoleSinglelampDataMapper.xml | 54 +++-----
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 23 +++
.idea/compiler.xml | 1
src/main/java/api/controller/SinglelampDataController.java | 2
target/api-1.0-SNAPSHOT.jar.original | 0
target/maven-archiver/pom.properties | 2
src/main/java/api/bean/ReqParams.java | 13 ++
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 43 +++---
17 files changed, 163 insertions(+), 193 deletions(-)
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 35410ca..ad38804 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -6,3 +6,5 @@
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
+# Zeppelin ignored files
+/ZeppelinRemoteNotebooks/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 7003b9b..110759a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
+ <option name="BUILD_PROCESS_HEAP_SIZE" value="4096" />
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
deleted file mode 100644
index e1f5a3c..0000000
--- a/.idea/dataSources.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
- <data-source source="LOCAL" name="@47.106.172.9" uuid="673b6e88-ea79-47e3-b3d4-c376797d32da">
- <driver-ref>mysql.8</driver-ref>
- <synchronize>true</synchronize>
- <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
- <jdbc-url>jdbc:mysql://47.106.172.9:2512</jdbc-url>
- <working-dir>$ProjectFileDir$</working-dir>
- </data-source>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/free-mybatis-generator-config.xml b/.idea/free-mybatis-generator-config.xml
deleted file mode 100644
index d119793..0000000
--- a/.idea/free-mybatis-generator-config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="PersistentConfig">
- <option name="historyConfigList">
- <map>
- <entry key="pole_singlelamp_data">
- <value>
- <Config>
- <option name="comment" value="true" />
- <option name="daoMvnPath" value="src/main/java" />
- <option name="daoName" value="PoleSinglelampDataDao" />
- <option name="daoPackage" value="api.dao" />
- <option name="daoPostfix" value="Dao" />
- <option name="modelMvnPath" value="src/main/java" />
- <option name="modelName" value="PoleSinglelampData" />
- <option name="modelPackage" value="api.bean" />
- <option name="name" value="pole_singlelamp_data" />
- <option name="offsetLimit" value="true" />
- <option name="overrideJava" value="true" />
- <option name="overrideXML" value="true" />
- <option name="primaryKey" value="streetlight_id" />
- <option name="projectFolder" value="$PROJECT_DIR$" />
- <option name="tableName" value="pole_singlelamp_data" />
- <option name="useLombokPlugin" value="true" />
- <option name="useSchemaPrefix" value="true" />
- <option name="xmlMvnPath" value="src/main/resources" />
- <option name="xmlPackage" value="generator" />
- </Config>
- </value>
- </entry>
- </map>
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 6560a98..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<component name="InspectionProjectProfileManager">
- <profile version="1.0">
- <option name="myName" value="Project Default" />
- <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
- <option name="TOP_LEVEL_CLASS_OPTIONS">
- <value>
- <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
- <option name="REQUIRED_TAGS" value="" />
- </value>
- </option>
- <option name="INNER_CLASS_OPTIONS">
- <value>
- <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
- <option name="REQUIRED_TAGS" value="" />
- </value>
- </option>
- <option name="METHOD_OPTIONS">
- <value>
- <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
- <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
- </value>
- </option>
- <option name="FIELD_OPTIONS">
- <value>
- <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
- <option name="REQUIRED_TAGS" value="" />
- </value>
- </option>
- <option name="IGNORE_DEPRECATED" value="false" />
- <option name="IGNORE_JAVADOC_PERIOD" value="true" />
- <option name="IGNORE_DUPLICATED_THROWS" value="false" />
- <option name="IGNORE_POINT_TO_ITSELF" value="false" />
- <option name="myAdditionalJavadocTags" value="date" />
- </inspection_tool>
- </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 12ae1fe..ae53faa 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -2,9 +2,19 @@
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
- <option name="id" value="spring-releases" />
- <option name="name" value="Spring Releases" />
- <option name="url" value="https://maven.aliyun.com/repository/public" />
+ <option name="id" value="central" />
+ <option name="name" value="Central Repository" />
+ <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="spring-snapshots" />
+ <option name="name" value="Spring Snapshots" />
+ <option name="url" value="http://repo.spring.io/libs-snapshot-local" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="spring-milestones" />
+ <option name="name" value="Spring Milestones" />
+ <option name="url" value="http://repo.spring.io/libs-milestone-local" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
@@ -17,19 +27,9 @@
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
- <option name="id" value="spring-milestones" />
- <option name="name" value="Spring Milestones" />
- <option name="url" value="https://maven.aliyun.com/repository/public" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="central" />
- <option name="name" value="Central Repository" />
- <option name="url" value="https://maven.aliyun.com/repository/public" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="spring-snapshots" />
- <option name="name" value="Spring Snapshots" />
- <option name="url" value="https://maven.aliyun.com/repository/public" />
+ <option name="id" value="spring-releases" />
+ <option name="name" value="Spring Releases" />
+ <option name="url" value="http://repo.spring.io/libs-release-local" />
</remote-repository>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b819715..e926432 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,6 +13,9 @@
</map>
</option>
</component>
+ <component name="ComposerSettings">
+ <execution />
+ </component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
@@ -21,5 +24,8 @@
</list>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="jdk8u322-b06" project-jdk-type="JavaSDK" />
+ <component name="ProjectType">
+ <option name="id" value="jpab" />
+ </component>
</project>
\ No newline at end of file
diff --git a/.idea/mybatisx/templates.xml b/.idea/mybatisx/templates.xml
deleted file mode 100644
index 9099a3c..0000000
--- a/.idea/mybatisx/templates.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="TemplatesSettings">
- <option name="templateConfigs">
- <TemplateContext>
- <option name="generateConfig">
- <GenerateConfig>
- <option name="annotationType" value="NONE" />
- <option name="basePackage" value="generator" />
- <option name="basePath" value="src/main/java" />
- <option name="encoding" value="UTF-8" />
- <option name="extraClassSuffix" value="" />
- <option name="ignoreFieldPrefix" value="" />
- <option name="ignoreFieldSuffix" value="" />
- <option name="ignoreTablePrefix" value="" />
- <option name="ignoreTableSuffix" value="" />
- <option name="moduleName" value="api" />
- <option name="modulePath" value="$PROJECT_DIR$/" />
- <option name="moduleUIInfoList">
- <list>
- <ModuleInfoGo>
- <option name="basePath" value="${domain.basePath}" />
- <option name="configName" value="mapperInterface" />
- <option name="encoding" value="${domain.encoding}" />
- <option name="fileName" value="${domain.fileName}Mapper" />
- <option name="fileNameWithSuffix" value="${domain.fileName}Mapper.java" />
- <option name="modulePath" value="$PROJECT_DIR$/" />
- <option name="packageName" value="${domain.basePackage}.mapper" />
- </ModuleInfoGo>
- <ModuleInfoGo>
- <option name="basePath" value="src/main/resources" />
- <option name="configName" value="mapperXml" />
- <option name="encoding" value="${domain.encoding}" />
- <option name="fileName" value="${domain.fileName}Mapper" />
- <option name="fileNameWithSuffix" value="${domain.fileName}Mapper.xml" />
- <option name="modulePath" value="$PROJECT_DIR$/" />
- <option name="packageName" value="mapper" />
- </ModuleInfoGo>
- <ModuleInfoGo>
- <option name="basePath" value="${domain.basePath}" />
- <option name="configName" value="serviceImpl" />
- <option name="encoding" value="${domain.encoding}" />
- <option name="fileName" value="${domain.fileName}ServiceImpl" />
- <option name="fileNameWithSuffix" value="${domain.fileName}ServiceImpl.java" />
- <option name="modulePath" value="$PROJECT_DIR$/" />
- <option name="packageName" value="${domain.basePackage}.service.impl" />
- </ModuleInfoGo>
- <ModuleInfoGo>
- <option name="basePath" value="${domain.basePath}" />
- <option name="configName" value="serviceInterface" />
- <option name="encoding" value="${domain.encoding}" />
- <option name="fileName" value="${domain.fileName}Service" />
- <option name="fileNameWithSuffix" value="${domain.fileName}Service.java" />
- <option name="modulePath" value="$PROJECT_DIR$/" />
- <option name="packageName" value="${domain.basePackage}.service" />
- </ModuleInfoGo>
- </list>
- </option>
- <option name="needToStringHashcodeEquals" value="true" />
- <option name="needsComment" value="true" />
- <option name="relativePackage" value="domain" />
- <option name="superClass" value="" />
- <option name="tableUIInfoList">
- <list>
- <TableUIInfo>
- <option name="className" value="PoleSinglelampData" />
- <option name="tableName" value="pole_singlelamp_data_mq" />
- </TableUIInfo>
- </list>
- </option>
- <option name="templatesName" value="mybatis-plus2" />
- </GenerateConfig>
- </option>
- <option name="moduleName" value="api" />
- <option name="projectPath" value="$PROJECT_DIR$" />
- <option name="templateName" value="mybatis-plus2" />
- </TemplateContext>
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="RunConfigurationProducerService">
- <option name="ignoredProducers">
- <set>
- <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
- </set>
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
index e96534f..2b63946 100644
--- a/.idea/uiDesigner.xml
+++ b/.idea/uiDesigner.xml
@@ -2,121 +2,121 @@
<project version="4">
<component name="Palette2">
<group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
- <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
- <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
- <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
diff --git a/src/main/java/api/bean/ReqParams.java b/src/main/java/api/bean/ReqParams.java
index f3f301a..11e5697 100644
--- a/src/main/java/api/bean/ReqParams.java
+++ b/src/main/java/api/bean/ReqParams.java
@@ -22,8 +22,19 @@
private Long lightId;
- private Long[] lightIds;
+
+ private Long[] adIds;
private String mac;
+ private String apiKey;
+ private Long userId;
+// 鍏抽敭瀛�
+ private String key;
+// 鎺х伅鎺ユ敹
+ private PoleLightBatchEntity poleLightBatch;
+
+ public String getApiKey() {
+ return "84b5f9d6b37c47edb1adae628aaaf3e5";
+ }
}
diff --git a/src/main/java/api/bean/SinglelampDataEntity.java b/src/main/java/api/bean/SinglelampDataEntity.java
index 7fcbf74..4176beb 100644
--- a/src/main/java/api/bean/SinglelampDataEntity.java
+++ b/src/main/java/api/bean/SinglelampDataEntity.java
@@ -1,6 +1,7 @@
package api.bean;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.io.Serializable;
@@ -51,5 +52,8 @@
// 绱鐢ㄧ數鐢甸噺
private Double totalUsingPower;
// 鍒涘缓鏃堕棿
+ @JSONField(format="yyyy-MM-dd HH:mm:ss.SSS")
private Date createTime;
+ //鐏ご浜屼寒搴�
+ private Integer lightSecondPercent;
}
diff --git a/src/main/java/api/controller/LampController.java b/src/main/java/api/controller/LampController.java
deleted file mode 100644
index 0acc4ee..0000000
--- a/src/main/java/api/controller/LampController.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package api.controller;
-
-import api.bean.LampEntity;
-import api.bean.ReqParams;
-import api.dao.LampDao;
-import api.result.Msg;
-import api.service.AccessService;
-import api.service.LampService;
-import com.github.pagehelper.PageInfo;
-import com.google.common.util.concurrent.RateLimiter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author van
- * @version 1.0
- * msg锛氬崟鐏暟鎹帶鍒跺眰
- * @date 2021/11/2 15:04
- */
-@RestController
-@RequestMapping("/lamp")
-public class LampController {
-
- @Autowired
- private AccessService accessService;
- @Autowired
- private LampService lampService;
-
- RateLimiter rateLimiter = RateLimiter.create(10.0);
-
- @RequestMapping(value = "/list",method = RequestMethod.POST)
- public Msg list(@RequestBody ReqParams reqParams){
- rateLimiter.acquire(1);
- if (reqParams.getLimit()>50){
- return Msg.error("limit exception!!!");
- }
- Long userId = accessService.getUserId(reqParams.getAccessToken());
-
- if(userId == null){
- return Msg.error("server exception!!!");
- }
-
- PageInfo<LampEntity> info = lampService.selectList(userId,reqParams);
-
- Map data = new HashMap();
-
- data.put("total",info.getTotal());
- data.put("list",info.getList());
-
- return Msg.ok().put("data",data);
-
- }
- @RequestMapping(value ="/info",method = RequestMethod.POST)
- public Msg info(@RequestBody ReqParams reqParams){
- rateLimiter.acquire(1);
- if (reqParams.getLimit()>50){
- return Msg.error("limit exception!!!");
- }
- Long userId = accessService.getUserId(reqParams.getAccessToken());
-
- if(userId == null){
- return Msg.error("server exception!!!");
- }
-
- PageInfo<LampEntity> info = lampService.selectByStreetlightId(reqParams);
-
- Map data = new HashMap();
-
- data.put("total",info.getTotal());
- data.put("list",info.getList());
-
- return Msg.ok().put("data",data);
- }
-
-}
diff --git a/src/main/java/api/controller/SinglelampDataController.java b/src/main/java/api/controller/SinglelampDataController.java
index 48e689b..843f4c0 100644
--- a/src/main/java/api/controller/SinglelampDataController.java
+++ b/src/main/java/api/controller/SinglelampDataController.java
@@ -1,11 +1,9 @@
package api.controller;
-import api.bean.LampEntity;
import api.bean.ReqParams;
import api.bean.SinglelampDataEntity;
import api.result.Msg;
import api.service.AccessService;
-import api.service.LampService;
import api.service.SinglelampDataServer;
import com.github.pagehelper.PageInfo;
import com.google.common.util.concurrent.RateLimiter;
diff --git a/src/main/java/api/dao/SinglelampDataDao.java b/src/main/java/api/dao/SinglelampDataDao.java
index cf7b541..0441d70 100644
--- a/src/main/java/api/dao/SinglelampDataDao.java
+++ b/src/main/java/api/dao/SinglelampDataDao.java
@@ -3,6 +3,7 @@
import api.bean.LampEntity;
import api.bean.SinglelampDataEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -20,7 +21,7 @@
/**瓒呯骇绠＄悊鍛樻煡鎵惧叏閮�*/
List<SinglelampDataEntity> selectAll();
/**鏅�氱鐞嗗憳鎸夊叕鍙告煡鎵�*/
- List<SinglelampDataEntity> selectByCompany(Long userId);
+ List<SinglelampDataEntity> selectByCompany(@Param("page") Integer page, @Param("size") Integer size,@Param("userId") Long userId);
/**鐢ㄦ埛鏌ユ壘*/
//List<SinglelampDataEntity> selectByUserId(Long userId);
/**鍗曚釜鐏潌鏁版嵁*/
diff --git a/src/main/java/api/service/LampService.java b/src/main/java/api/service/LampService.java
deleted file mode 100644
index 69627d3..0000000
--- a/src/main/java/api/service/LampService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package api.service;
-
-import api.bean.LampEntity;
-import api.bean.ReqParams;
-import api.bean.WeatherEntity;
-import api.dao.LampDao;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author van
- * @version 1.0
- * msg锛氬崟鐏暟鎹�
- * @date 2021/11/2 10:24
- */
-@Service("lampService")
-public class LampService {
- @Autowired
- private AccessService accessService;
- @Autowired
- private LampDao lampDao;
- public PageInfo<LampEntity> selectList(Long userId, ReqParams reqParams){
- Long roleId = accessService.getRoleId(userId);
-
- if(roleId == null || roleId == 0){
- return null;
- }
-
- List<LampEntity> list = null;
-
- if(roleId.longValue() == 1 ){
- PageHelper.startPage(reqParams.getPage(),reqParams.getLimit());
- list = lampDao.selectAll();
- }else if (roleId.longValue() == 2){
- PageHelper.startPage(reqParams.getPage(),reqParams.getLimit());
- list = lampDao.selectByCompany(userId);
- }else if (roleId.longValue() == 3){
- PageHelper.startPage(reqParams.getPage(),reqParams.getLimit());
- list = lampDao.selectByUserId(userId);
- }
- PageInfo<LampEntity> page = new PageInfo<>(list);
- return page;
-
-}
-
- public PageInfo<LampEntity> selectByStreetlightId(ReqParams reqParams) {
- PageHelper.startPage(reqParams.getPage(),reqParams.getLimit());
- List<LampEntity> list = lampDao.selectByStreetlightId(reqParams.getLightId());
- PageInfo<LampEntity> page = new PageInfo<>(list);
- return page;
- }
-}
diff --git a/src/main/java/api/service/SinglelampDataServer.java b/src/main/java/api/service/SinglelampDataServer.java
index ae13165..8370a73 100644
--- a/src/main/java/api/service/SinglelampDataServer.java
+++ b/src/main/java/api/service/SinglelampDataServer.java
@@ -37,8 +37,9 @@
PageHelper.startPage(reqParams.getPage(),reqParams.getLimit());
list = singlelampDao.selectAll();
}else if (roleId.longValue() == 2 || roleId.longValue() == 3){
- PageHelper.startPage(reqParams.getPage(),reqParams.getLimit());
- list = singlelampDao.selectByCompany(userId);
+ PageHelper.startPage(reqParams.getPage(),reqParams.getLimit());
+ list = singlelampDao.selectByCompany(reqParams.getPage(),reqParams.getLimit(),userId);
+
}
PageInfo<SinglelampDataEntity> page = new PageInfo<>(list);
return page;
diff --git a/src/main/resources/mapper/PoleSinglelampDataMapper.xml b/src/main/resources/mapper/PoleSinglelampDataMapper.xml
index cb1f884..cae20f4 100644
--- a/src/main/resources/mapper/PoleSinglelampDataMapper.xml
+++ b/src/main/resources/mapper/PoleSinglelampDataMapper.xml
@@ -24,47 +24,35 @@
<select id="selectByCompany" resultType="api.bean.SinglelampDataEntity">
select
- ps.streetlight_name,ps.streetlight_id,
- psdm.*
+ *
from
pole_singlelamp_data_mq psdm
- left join pole_streetlight ps on
- psdm.mac = ps.code_number
- where
- psdm.singlelamp_data_id in (
+ join
+ (
select
- max(singlelamp_data_id)
+ ps.streetlight_id as id ,
+ ps.streetlight_name
from
- pole_singlelamp_data_mq
- where
- pole_singlelamp_data_mq.mac
- in (
+ pole_streetlight ps
+ where ps.streetlight_id in (
+ select
+ pus.streetlight_id
+ from
+ pole_user_streetlight pus
+ where
+ pus.company_id in(
select
- ps2.code_number
+ suc.company_id
from
- pole_streetlight ps2
+ sys_user_company suc
where
- ps2.streetlight_id
- in (
- select
- pus.streetlight_id
- from
- pole_user_streetlight pus
- where
- pus.company_id in(
- select
- suc.company_id
- from
- sys_user_company suc
- where
- suc.user_id = #{userId})
- )
+ suc.user_id =
+ #{userId}
)
- group by
- mac
- )
- order by
- streetlight_id
+ )
+ limit #{page},#{size}) idAndName
+ on idAndName .id = psdm .streetlight_id
+ group by psdm .streetlight_id
</select>
diff --git a/target/api-1.0-SNAPSHOT.jar.original b/target/api-1.0-SNAPSHOT.jar.original
index 4b3ead4..bf473bc 100644
--- a/target/api-1.0-SNAPSHOT.jar.original
+++ b/target/api-1.0-SNAPSHOT.jar.original
Binary files differ
diff --git a/target/classes/mapper/PoleSinglelampDataMapper.xml b/target/classes/mapper/PoleSinglelampDataMapper.xml
index cb1f884..cae20f4 100644
--- a/target/classes/mapper/PoleSinglelampDataMapper.xml
+++ b/target/classes/mapper/PoleSinglelampDataMapper.xml
@@ -24,47 +24,35 @@
<select id="selectByCompany" resultType="api.bean.SinglelampDataEntity">
select
- ps.streetlight_name,ps.streetlight_id,
- psdm.*
+ *
from
pole_singlelamp_data_mq psdm
- left join pole_streetlight ps on
- psdm.mac = ps.code_number
- where
- psdm.singlelamp_data_id in (
+ join
+ (
select
- max(singlelamp_data_id)
+ ps.streetlight_id as id ,
+ ps.streetlight_name
from
- pole_singlelamp_data_mq
- where
- pole_singlelamp_data_mq.mac
- in (
+ pole_streetlight ps
+ where ps.streetlight_id in (
+ select
+ pus.streetlight_id
+ from
+ pole_user_streetlight pus
+ where
+ pus.company_id in(
select
- ps2.code_number
+ suc.company_id
from
- pole_streetlight ps2
+ sys_user_company suc
where
- ps2.streetlight_id
- in (
- select
- pus.streetlight_id
- from
- pole_user_streetlight pus
- where
- pus.company_id in(
- select
- suc.company_id
- from
- sys_user_company suc
- where
- suc.user_id = #{userId})
- )
+ suc.user_id =
+ #{userId}
)
- group by
- mac
- )
- order by
- streetlight_id
+ )
+ limit #{page},#{size}) idAndName
+ on idAndName .id = psdm .streetlight_id
+ group by psdm .streetlight_id
</select>
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 0500135..da6401f 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,3 +1,3 @@
+version=1.0-SNAPSHOT
groupId=api
artifactId=api
-version=1.0-SNAPSHOT
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index e69de29..abb2cf1 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,23 @@
+api\dao\LampDao.class
+api\service\PoleService.class
+api\bean\SinglelampDataEntity.class
+api\controller\PoleController.class
+api\service\WeatherService.class
+api\utils\httpClient.class
+api\bean\PoleLightBatchEntity.class
+api\bean\ReqParams.class
+api\service\SinglelampDataServer.class
+api\utils\HttpUtil.class
+api\controller\WeatherController.class
+api\controller\SinglelampDataController.class
+api\dao\SinglelampDataDao.class
+api\dao\AccessDao.class
+api\service\AccessService.class
+api\bean\LampEntity.class
+api\result\Msg.class
+api\bean\AccessEntity.class
+api\utils\CommonHeader.class
+api\APIApplication.class
+api\dao\WeatherDao.class
+api\bean\WeatherEntity.class
+api\controller\AccessController.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 1701650..3ac34f1 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,20 +1,23 @@
-C:\Coding\api\src\main\java\api\service\LampService.java
-C:\Coding\api\src\main\java\api\APIApplication.java
-C:\Coding\api\src\main\java\api\service\SinglelampDataServer.java
-C:\Coding\api\src\main\java\api\bean\ReqParams.java
-C:\Coding\api\src\main\java\api\controller\AccessController.java
-C:\Coding\api\src\main\java\api\utils\httpClient.java
-C:\Coding\api\src\main\java\api\bean\SinglelampDataEntity.java
-C:\Coding\api\src\main\java\api\bean\LampEntity.java
-C:\Coding\api\src\main\java\api\result\Msg.java
-C:\Coding\api\src\main\java\api\dao\AccessDao.java
-C:\Coding\api\src\main\java\api\bean\WeatherEntity.java
-C:\Coding\api\src\main\java\api\service\AccessService.java
-C:\Coding\api\src\main\java\api\dao\SinglelampDataDao.java
-C:\Coding\api\src\main\java\api\controller\LampController.java
-C:\Coding\api\src\main\java\api\controller\WeatherController.java
-C:\Coding\api\src\main\java\api\dao\LampDao.java
-C:\Coding\api\src\main\java\api\bean\AccessEntity.java
-C:\Coding\api\src\main\java\api\dao\WeatherDao.java
-C:\Coding\api\src\main\java\api\controller\SinglelampDataController.java
-C:\Coding\api\src\main\java\api\service\WeatherService.java
+D:\Coding\api\src\main\java\api\dao\SinglelampDataDao.java
+D:\Coding\api\src\main\java\api\service\WeatherService.java
+D:\Coding\api\src\main\java\api\bean\AccessEntity.java
+D:\Coding\api\src\main\java\api\service\AccessService.java
+D:\Coding\api\src\main\java\api\bean\ReqParams.java
+D:\Coding\api\src\main\java\api\controller\PoleController.java
+D:\Coding\api\src\main\java\api\service\PoleService.java
+D:\Coding\api\src\main\java\api\service\SinglelampDataServer.java
+D:\Coding\api\src\main\java\api\utils\httpClient.java
+D:\Coding\api\src\main\java\api\utils\HttpUtil.java
+D:\Coding\api\src\main\java\api\controller\SinglelampDataController.java
+D:\Coding\api\src\main\java\api\dao\WeatherDao.java
+D:\Coding\api\src\main\java\api\bean\SinglelampDataEntity.java
+D:\Coding\api\src\main\java\api\bean\WeatherEntity.java
+D:\Coding\api\src\main\java\api\bean\PoleLightBatchEntity.java
+D:\Coding\api\src\main\java\api\dao\AccessDao.java
+D:\Coding\api\src\main\java\api\result\Msg.java
+D:\Coding\api\src\main\java\api\utils\CommonHeader.java
+D:\Coding\api\src\main\java\api\controller\AccessController.java
+D:\Coding\api\src\main\java\api\bean\LampEntity.java
+D:\Coding\api\src\main\java\api\controller\WeatherController.java
+D:\Coding\api\src\main\java\api\dao\LampDao.java
+D:\Coding\api\src\main\java\api\APIApplication.java
--
Gitblit v1.9.3