Van333
2022-06-07 a42cacf1663d5744bab87fed467d5445d865b7e1
添加路灯列表接口,在线查询接口,控灯接口
已修改16个文件
已删除7个文件
606 ■■■■ 文件已修改
.idea/.gitignore 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/compiler.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/dataSources.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/free-mybatis-generator-config.xml 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/inspectionProfiles/Project_Default.xml 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/jarRepositories.xml 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/misc.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/mybatisx/templates.xml 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/runConfigurations.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/uiDesigner.xml 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/api/bean/ReqParams.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/api/bean/SinglelampDataEntity.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/api/controller/LampController.java 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/api/controller/SinglelampDataController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/api/dao/SinglelampDataDao.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/api/service/LampService.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/api/service/SinglelampDataServer.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PoleSinglelampDataMapper.xml 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/api-1.0-SNAPSHOT.jar.original 补丁 | 查看 | 原始文档 | blame | 历史
target/classes/mapper/PoleSinglelampDataMapper.xml 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/maven-archiver/pom.properties 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/.gitignore
@@ -6,3 +6,5 @@
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
# Zeppelin ignored files
/ZeppelinRemoteNotebooks/
.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">
.idea/dataSources.xml
ÎļþÒÑɾ³ý
.idea/free-mybatis-generator-config.xml
ÎļþÒÑɾ³ý
.idea/inspectionProfiles/Project_Default.xml
ÎļþÒÑɾ³ý
.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>
.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>
.idea/mybatisx/templates.xml
ÎļþÒÑɾ³ý
.idea/runConfigurations.xml
ÎļþÒÑɾ³ý
.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>
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";
    }
}
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;
}
src/main/java/api/controller/LampController.java
ÎļþÒÑɾ³ý
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;
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);
    /**单个灯杆数据*/
src/main/java/api/service/LampService.java
ÎļþÒÑɾ³ý
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;
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>
target/api-1.0-SNAPSHOT.jar.original
Binary files differ
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>
target/maven-archiver/pom.properties
@@ -1,3 +1,3 @@
version=1.0-SNAPSHOT
groupId=api
artifactId=api
version=1.0-SNAPSHOT
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
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