Skip to content

C
cneeds-server
Commit 033f1b47 by zzrdark
Options

1.增加删除统计设备渠道号 

2.修复查询统计设备渠道号信息
3.修复适配配置
parent ae27453c
Showing with 278 additions and 116 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.日志更改&#10;2.修改前端代码&#10;3.更改黑白名单编码&#10;4.增加logMedia 的fileSize">
<change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/AndroidDeviceChannelVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/css/chunk-18a40ee2.9d63d053.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/css/chunk-1a86e192.9d63d053.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/css/chunk-25a34ff8.9d63d053.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/app.cf1e9370.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-06aa7494.79f5e602.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-06ed166b.f6545525.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-18a40ee2.56744623.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-1a86e192.d6dcc59b.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-218bb4cf.0b4035d6.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-22e5f704.95aed682.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-25a34ff8.b4f84a29.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-2b4823a9.51b17cc9.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-4ab8490a.52ceb2fb.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-5411756c.d9f1a004.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-5c585ee6.5c291cf7.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-77a4bbf0.ff5c0291.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-e20529e6.5db40fa1.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-e33fc590.32c81d22.js" afterDir="false" />
<list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.">
<change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/StatisticsDeviceChannelDto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/StatisticsDeviceChannelVo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/db/cneeds_server.sql" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/db/cneeds_server.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceChannelEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceChannelEntity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoEntity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/DeviceInfoDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/DeviceInfoDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DevicesDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DevicesDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceChannelVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceChannelVo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DeviceChannelStatisticsDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DeviceChannelStatisticsDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/DatashowApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/DatashowApplication.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/css/chunk-113720ab.9d63d053.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/app.ce6e6113.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-06aa7494.06e9eb28.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-0b251b6b.eb155394.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-113720ab.c13124c4.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-1d606ab9.36c5da6b.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-218bb4cf.2c87854b.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-2b4823a9.8b477be6.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-4ab8490a.d0b52c5a.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-5411756c.80e1e589.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-acf60ff8.f55e1c1c.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-e33fc590.edc65535.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceChannelService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceChannelService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoChannelService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoChannelService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceChannelServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceChannelServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoChannelServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoChannelServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceChannelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceChannelController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/resources/application.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -134,7 +96,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Modules" />
......@@ -145,39 +107,39 @@
<property name="settings.editor.splitter.proportion" value="0.20898877" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-common-data\src\test" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds" />
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
<recent name="E:\mx_project\cneeds-server" />
<recent name="E:\mx_project\cneeds-server\src" />
<recent name="E:\mx_project\cneeds-server\cneeds-common-data\src\main\resources\mapper" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-logupload" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-logupload\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-common-hadoop-dfs\src\main\resources" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.mx.cneeds.common.vo" />
<recent name="com.mx.cneeds.common.dto" />
<recent name="com.mx.cneeds.common.vo" />
<recent name="com.mx.cneeds.server.device.service.impl" />
<recent name="com.mx.cneeds.server.device.service" />
<recent name="com.mx.cneeds.server.datashow.web.device" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-common-data\src\main\resources\mapper" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-logupload" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-logupload\src\main\resources" />
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources\template" />
<recent name="E:\mx_project\cneeds-server\cneeds-common-data\src\test" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-common-hadoop-dfs\src\main\resources" />
<recent name="E:\mx_project\cneeds-server" />
</key>
</component>
<component name="RestServicesNavigator">
<treeState>
<expand>
<path>
<item name="Found 143 services " type="fcff1e1b:RestServiceStructure$RootNode" />
<item name="Found 158 services " type="fcff1e1b:RestServiceStructure$RootNode" />
</path>
</expand>
<select />
</treeState>
</component>
<component name="RunManager" selected="Spring Boot.DatashowApplication">
<component name="RunManager" selected="Spring Boot.DeviceApplication">
<configuration name="EurekaServerApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.mx.cneeds.server.eureka.EurekaServerApplication" />
<module name="cneeds-server-eureka" />
......@@ -401,7 +363,19 @@
<workItem from="1588988147425" duration="10178000" />
<workItem from="1589161111437" duration="13962000" />
<workItem from="1589248496931" duration="17965000" />
<workItem from="1589334695528" duration="19469000" />
<workItem from="1589334695528" duration="19625000" />
<workItem from="1589422182283" duration="15513000" />
<workItem from="1589511331719" duration="9817000" />
<workItem from="1589769154832" duration="7154000" />
<workItem from="1589852336640" duration="16490000" />
<workItem from="1589938857409" duration="16245000" />
<workItem from="1590025221291" duration="23685000" />
<workItem from="1590111731345" duration="18501000" />
<workItem from="1590370811568" duration="21732000" />
<workItem from="1590457495095" duration="8778000" />
<workItem from="1590494119415" duration="255000" />
<workItem from="1590544161162" duration="18204000" />
<workItem from="1590631453001" duration="20430000" />
</task>
<task id="LOCAL-00001" summary="1.修改不需要web服务 &#10;2.增加一个logupload">
<created>1578451117064</created>
......@@ -634,7 +608,63 @@
<option name="project" value="LOCAL" />
<updated>1589283330576</updated>
</task>
<option name="localTasksCounter" value="34" />
<task id="LOCAL-00034" summary="1.更新渠道号管理模块">
<created>1589370871224</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1589370871224</updated>
</task>
<task id="LOCAL-00035" summary="1.修改删除渠道号 并删除关联的渠道号&#10;2.增加终端log上传的设备版本参数">
<created>1589454091186</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1589454091186</updated>
</task>
<task id="LOCAL-00036" summary="1.Log上传增加设备信息&#10;2.增加 渠道号管理 修改接口&#10;3.增加 渠道号统计页面">
<created>1589888833872</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1589888833872</updated>
</task>
<task id="LOCAL-00037" summary="1.设备批量增加">
<created>1590153205378</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1590153205378</updated>
</task>
<task id="LOCAL-00038" summary="1.增加批量配置模块和页面">
<created>1590405051233</created>
<option name="number" value="00038" />
<option name="presentableId" value="LOCAL-00038" />
<option name="project" value="LOCAL" />
<updated>1590405051233</updated>
</task>
<task id="LOCAL-00039" summary="1.增加下载模板&#10;2.修复其他接口请求问题">
<created>1590494224073</created>
<option name="number" value="00039" />
<option name="presentableId" value="LOCAL-00039" />
<option name="project" value="LOCAL" />
<updated>1590494224073</updated>
</task>
<task id="LOCAL-00040" summary="1.fix 系列号修改不成功">
<created>1590549904888</created>
<option name="number" value="00040" />
<option name="presentableId" value="LOCAL-00040" />
<option name="project" value="LOCAL" />
<updated>1590549904888</updated>
</task>
<task id="LOCAL-00041" summary="1.修改适配配置配置结果">
<created>1590577249854</created>
<option name="number" value="00041" />
<option name="presentableId" value="LOCAL-00041" />
<option name="project" value="LOCAL" />
<updated>1590577249854</updated>
</task>
<option name="localTasksCounter" value="42" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -685,14 +715,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="1.增加登陆，等" />
<MESSAGE value="1.部门模块&#10;2.角色模块部分" />
<MESSAGE value="2.角色模块增删改查" />
<MESSAGE value="1.用户模块" />
<MESSAGE value="1.增加页面&#10;2.系统管理大模块的修改&#10;3. 产品系列" />
<MESSAGE value="1.增加页面&#10;2.系统管理大模块的修改&#10;3.设备控制模块" />
<MESSAGE value="1.fix设备模块&#10;2.生产配置" />
<MESSAGE value="1.fix设备模块 生产配置&#10;2.个人信息" />
<MESSAGE value="1.mqtt&#10;2.日志上传模块" />
<MESSAGE value="1.日志上传模块" />
<MESSAGE value="1.日志上传模块&#10;2.修改数据库" />
......@@ -710,7 +732,15 @@
<MESSAGE value="1.增加渠道商模块" />
<MESSAGE value="1.渠道号管理" />
<MESSAGE value="1.渠道号模块完成" />
<option name="LAST_COMMIT_MESSAGE" value="1.渠道号模块完成" />
<MESSAGE value="1.更新渠道号管理模块" />
<MESSAGE value="1.修改删除渠道号 并删除关联的渠道号&#10;2.增加终端log上传的设备版本参数" />
<MESSAGE value="1.Log上传增加设备信息&#10;2.增加 渠道号管理 修改接口&#10;3.增加 渠道号统计页面" />
<MESSAGE value="1.设备批量增加" />
<MESSAGE value="1.增加批量配置模块和页面" />
<MESSAGE value="1.增加下载模板&#10;2.修复其他接口请求问题" />
<MESSAGE value="1.fix 系列号修改不成功" />
<MESSAGE value="1.修改适配配置配置结果" />
<option name="LAST_COMMIT_MESSAGE" value="1.修改适配配置配置结果" />
</component>
<component name="WindowStateProjectService">
<state x="590" y="156" key="#LogUploadApplication" timestamp="1585894479679">
......@@ -745,66 +775,66 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="703" y="356" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1583822701848" />
<state x="463" y="112" key="CommitChangelistDialog2" timestamp="1589370111773">
<state x="463" y="112" width="953" height="816" key="CommitChangelistDialog2" timestamp="1590577246304">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1589370111773" />
<state x="150" y="103" key="DiffContextDialog" timestamp="1588231118308">
<state x="463" y="112" width="953" height="816" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1590577246304" />
<state x="150" y="103" key="DiffContextDialog" timestamp="1590549880859">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="150" y="103" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1588231118308" />
<state x="150" y="103" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1590549880859" />
<state x="740" y="275" key="FileChooserDialogImpl" timestamp="1588922129570">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1588922129570" />
<state width="1877" height="330" key="GridCell.Tab.0.bottom" timestamp="1589370517768">
<state width="1877" height="365" key="GridCell.Tab.0.bottom" timestamp="1590663931653">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="330" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1589370517768" />
<state width="1877" height="330" key="GridCell.Tab.0.center" timestamp="1589370517768">
<state width="1877" height="365" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1590663931653" />
<state width="1877" height="365" key="GridCell.Tab.0.center" timestamp="1590663931652">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="330" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1589370517768" />
<state width="1877" height="330" key="GridCell.Tab.0.left" timestamp="1589370517768">
<state width="1877" height="365" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1590663931652" />
<state width="1877" height="365" key="GridCell.Tab.0.left" timestamp="1590663931652">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="330" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1589370517768" />
<state width="1877" height="330" key="GridCell.Tab.0.right" timestamp="1589370517768">
<state width="1877" height="365" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1590663931652" />
<state width="1877" height="365" key="GridCell.Tab.0.right" timestamp="1590663931652">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="330" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1589370517768" />
<state width="1877" height="311" key="GridCell.Tab.1.bottom" timestamp="1589370092141">
<state width="1877" height="365" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1590663931652" />
<state width="1877" height="365" key="GridCell.Tab.1.bottom" timestamp="1590663943291">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="311" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1589370092141" />
<state width="1877" height="311" key="GridCell.Tab.1.center" timestamp="1589370092141">
<state width="1877" height="365" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1590663943291" />
<state width="1877" height="365" key="GridCell.Tab.1.center" timestamp="1590663943291">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="311" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1589370092141" />
<state width="1877" height="311" key="GridCell.Tab.1.left" timestamp="1589370092141">
<state width="1877" height="365" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1590663943291" />
<state width="1877" height="365" key="GridCell.Tab.1.left" timestamp="1590663943291">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="311" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1589370092141" />
<state width="1877" height="311" key="GridCell.Tab.1.right" timestamp="1589370092141">
<state width="1877" height="365" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1590663943291" />
<state width="1877" height="365" key="GridCell.Tab.1.right" timestamp="1590663943291">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="311" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1589370092141" />
<state width="1877" height="311" key="GridCell.Tab.2.bottom" timestamp="1589370092142">
<state width="1877" height="365" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1590663943291" />
<state width="1877" height="365" key="GridCell.Tab.2.bottom" timestamp="1590663931511">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="311" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1589370092142" />
<state width="1877" height="311" key="GridCell.Tab.2.center" timestamp="1589370092142">
<state width="1877" height="365" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1590663931511" />
<state width="1877" height="365" key="GridCell.Tab.2.center" timestamp="1590663931511">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="311" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1589370092142" />
<state width="1877" height="311" key="GridCell.Tab.2.left" timestamp="1589370092142">
<state width="1877" height="365" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1590663931511" />
<state width="1877" height="365" key="GridCell.Tab.2.left" timestamp="1590663931510">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="311" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1589370092142" />
<state width="1877" height="311" key="GridCell.Tab.2.right" timestamp="1589370092142">
<state width="1877" height="365" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1590663931510" />
<state width="1877" height="365" key="GridCell.Tab.2.right" timestamp="1590663931511">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="311" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1589370092142" />
<state width="1877" height="365" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1590663931511" />
<state x="490" y="175" key="Maven.ArtifactSearchDialog" timestamp="1583320014926">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......@@ -817,10 +847,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="438" y="166" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1587869864619" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1589283331999">
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1590577251052">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1589283331999" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1590577251052" />
<state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1585818529449">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......@@ -829,14 +859,18 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1585564640710" />
<state x="92" y="92" width="1736" height="856" key="dock-window-1" timestamp="1589447713987">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="92" y="92" width="1736" height="856" key="dock-window-1/0.0.1920.1040@0.0.1920.1040" timestamp="1589447713987" />
<state x="690" y="284" key="extract.method.dialog" timestamp="1584010366958">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="690" y="284" key="extract.method.dialog/0.0.1920.1040@0.0.1920.1040" timestamp="1584010366958" />
<state x="636" y="253" width="702" height="534" key="find.popup" timestamp="1589368328304">
<state x="636" y="253" width="702" height="534" key="find.popup" timestamp="1589537559918">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="636" y="253" width="702" height="534" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1589368328304" />
<state x="636" y="253" width="702" height="534" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1589537559918" />
<state x="511" y="210" key="new project wizard" timestamp="1587463523363">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......@@ -845,10 +879,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="616" y="240" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1588144418613" />
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup" timestamp="1589368390090">
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup" timestamp="1590656952024">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1589368390090" />
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1590656952024" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -890,13 +924,13 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java</url>
<line>243</line>
<line>254</line>
<option name="timeStamp" value="61" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java</url>
<line>52</line>
<option name="timeStamp" value="65" />
<url>file://$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java</url>
<line>240</line>
<option name="timeStamp" value="69" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
......
cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DeviceChannelStatisticsDto.java
......@@ -13,6 +13,7 @@ import java.util.List;
@Data
public class DeviceChannelStatisticsDto {
/**
* 渠道号
*/
......@@ -32,6 +33,8 @@ public class DeviceChannelStatisticsDto {
private Long deptId;
private Long channelId;
private List<DeviceInfoDto> deviceInfoDtos;
}
cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/StatisticsDeviceChannelDto.java 0 → 100644
package com.mx.cneeds.common.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @ClassName StatisticsDeviceChannelVo
* @Author zzrdark
* @Date 2020-05-28 17:08
* @Description TODO
**/
@Data
public class StatisticsDeviceChannelDto implements Serializable {
private Long channelId;
private Integer channelRules;
}
cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/StatisticsDeviceChannelVo.java 0 → 100644
package com.mx.cneeds.common.vo;
import lombok.Data;
import java.io.Serializable;
/**
* @ClassName StatisticsDeviceChannelVo
* @Author zzrdark
* @Date 2020-05-28 17:08
* @Description TODO
**/
@Data
public class StatisticsDeviceChannelVo implements Serializable {
private Long channelId;
private Integer channelRules;
}
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/DatashowApplication.java
package com.mx.cneeds.server.datashow;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
......@@ -16,9 +17,17 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableEurekaClient
@EnableSwagger2
@EnableFeignClients
@Slf4j
public class DatashowApplication {
public static void main(String[] args) {
try {
SpringApplication.run(DatashowApplication.class);
} catch (Exception e) {
e.printStackTrace();
// （推荐）如果项目中存在日志框架，可以通过日志框架打印
log.debug("the exception is {}", e.getMessage(), e);
}
}
}
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java
......@@ -102,6 +102,9 @@ public interface DeviceClient {
@PostMapping("/device/devicechannel/queryTotalStatisticsDeviceChannel")
List<DeviceChannelStatisticsDto> queryTotalStatisticsDeviceChannel(@RequestBody(required = false) List<Long> channelIds);
@PostMapping("/device/devicechannel/deleteStatisticsDeviceChannel")
void deleteStatisticsDeviceChannel(@RequestBody StatisticsDeviceChannelDto dto);
@PostMapping("/device/info/queryDeviceChannelSetting")
List<String> queryDeviceChannelSetting(List<String> imeis);
}
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java
......@@ -353,7 +353,7 @@ public class DeviceController {
}
@RequestMapping("/device/queryDeviceChannelSetting")
public R queryDeviceChannelSetting(List<String> imeis){
public R queryDeviceChannelSetting(@RequestBody List<String> imeis){
if (imeis != null || imeis.size() != 0){
List<String> imeiList = deviceClient.queryDeviceChannelSetting(imeis);
......@@ -363,4 +363,15 @@ public class DeviceController {
return R.error(ResultCode.PARAMERROR,"参数错误");
}
@RequestMapping("/deviceChannel/deleteStatisticsDeviceChannel")
public R deleteStatisticsDeviceChannel(StatisticsDeviceChannelVo vo){
if (vo == null){
return R.error(ResultCode.PARAMERROR,"参数错误");
}
StatisticsDeviceChannelDto dto = new StatisticsDeviceChannelDto();
BeanUtils.copyProperties(vo,dto);
deviceClient.deleteStatisticsDeviceChannel(dto);
return R.ok();
}
}
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoChannelService.java
......@@ -17,8 +17,12 @@ public interface DeviceInfoChannelService extends IService<DeviceInfoChannelEnti
List<DeviceInfoChannelEntity> queryDeviceInfoChannelByDeviceId(Long deviceId);
List<DeviceInfoChannelEntity> queryDeviceInfoChannelByChannelId(Long channelId);
void removeDeivceInfoChannelByChannelId(List<Long> channelIds);
void removeDeivceInfoChannelByDeviceIdAndChannelId(Long channelId, List<Long> deviceIds);
List<DeviceInfoChannelEntity> queryDeviceInfoChannelByChannelIds(List<Long> channelIds);
List<DeviceInfoChannelEntity> queryDeviceInfoChannelByDeviceIds(List<Long> deviceIds);
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java
......@@ -26,5 +26,7 @@ public interface DeviceInfoService extends IService<DeviceInfoEntity> {
List<DeviceInfoEntity> queryDeviceByImeis(List<String> imeis);
List<DeviceInfoEntity> queryDeviceByIds(Set<Long> ids);
List<DeviceInfoEntity> queryDeviceByDeviceIdAndChannelRules(Integer channelRules, List<Long> deviceIds);
}
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoChannelServiceImpl.java
......@@ -24,6 +24,14 @@ public class DeviceInfoChannelServiceImpl extends ServiceImpl<DeviceInfoChannelD
return entities;
}
@Override
public List<DeviceInfoChannelEntity> queryDeviceInfoChannelByChannelId(Long channelId){
List<DeviceInfoChannelEntity> entities = getBaseMapper().
selectList(new QueryWrapper<DeviceInfoChannelEntity>().
eq("channel_id", channelId));
return entities;
}
@Override
public void removeDeivceInfoChannelByChannelId(List<Long> channelIds){
......@@ -33,6 +41,14 @@ public class DeviceInfoChannelServiceImpl extends ServiceImpl<DeviceInfoChannelD
}
@Override
public void removeDeivceInfoChannelByDeviceIdAndChannelId(Long channelId, List<Long> deviceIds){
getBaseMapper().delete(
new QueryWrapper<DeviceInfoChannelEntity>()
.eq("channel_id",channelId)
.in("device_id",deviceIds));
}
@Override
public List<DeviceInfoChannelEntity> queryDeviceInfoChannelByChannelIds(List<Long> channelIds){
List<DeviceInfoChannelEntity> deviceInfoChannelEntities = getBaseMapper().selectList(new QueryWrapper<DeviceInfoChannelEntity>()
.in("channel_id", channelIds));
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java
......@@ -81,5 +81,13 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoDao, DeviceInfo
return deviceInfoEntities;
}
@Override
public List<DeviceInfoEntity> queryDeviceByDeviceIdAndChannelRules(Integer channelRules, List<Long> deviceIds){
List<DeviceInfoEntity> deviceInfoEntities = getBaseMapper().selectList(new QueryWrapper<DeviceInfoEntity>()
.in("device_id", deviceIds)
.eq("channel_rules", channelRules));
return deviceInfoEntities;
}
}
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceChannelController.java
package com.mx.cneeds.server.device.web;
import com.mx.cneeds.common.dto.DeviceChannelDto;
import com.mx.cneeds.common.dto.DeviceChannelStatisticsDto;
import com.mx.cneeds.common.dto.DeviceInfoDto;
import com.mx.cneeds.common.dto.SeriesDto;
import com.mx.cneeds.common.dto.*;
import com.mx.cneeds.common.pager.PageUtils;
import com.mx.cneeds.common.result.R;
import com.mx.cneeds.common.validator.ValidatorUtils;
......@@ -171,6 +168,15 @@ public class DeviceChannelController {
public List<DeviceChannelStatisticsDto> queryTotalStatisticsDeviceChannel(@RequestBody(required = false) List<Long> channelIds){
List<DeviceInfoChannelEntity> deviceInfoChannelEntities = null;
if (channelIds == null || channelIds.size() == 0) {
channelIds = new LinkedList<>();
List<Long> finalChannelIds = channelIds;
List<DeviceChannelEntity> list = deviceChannelService.list();
list.forEach(deviceChannelEntity -> {
finalChannelIds.add(deviceChannelEntity.getChannelId());
});
deviceInfoChannelEntities = deviceInfoChannelService.list();
}else {
deviceInfoChannelEntities = deviceInfoChannelService.queryDeviceInfoChannelByChannelIds(channelIds);
......@@ -202,9 +208,9 @@ public class DeviceChannelController {
* 根据渠道号, 客户 ，渠道规则，禁用提示问题 进行统计
*/
// TODO 无参数的统计 无法筛选 channelIds 因为这个空
channelIds.forEach(channelId -> {
List<Long> deviceIdList = deviceIdChannelMap.get(channelId);
if (deviceIdList != null){
deviceIdList.forEach(deviceId -> {
DeviceInfoEntity deviceInfoEntity = deviceInfoEntityMapBykeyId.get(deviceId);
DeviceInfoDto dto = new DeviceInfoDto();
......@@ -225,6 +231,7 @@ public class DeviceChannelController {
deviceInfoList.add(dto);
map.put(sb.toString(),deviceInfoList);
});
}
});
......@@ -235,8 +242,9 @@ public class DeviceChannelController {
map.forEach((key,value) -> {
String[] s = key.split("__");
DeviceChannelStatisticsDto dto = new DeviceChannelStatisticsDto();
dto.setChannelNum(s[0]);
dto.setChannelId(Long.valueOf(s[0]));
DeviceChannelEntity entity = deviceChannelService.getById(dto.getChannelId());
dto.setChannelNum(entity.getChannelNum());
dto.setDeptId(Long.valueOf(s[1]));
dto.setChannelRules(Integer.valueOf(s[2]));
dto.setChannelNumsMessage(s[3]);
......@@ -250,5 +258,28 @@ public class DeviceChannelController {
}
@RequestMapping("/deleteStatisticsDeviceChannel")
public void deleteStatisticsDeviceChannel(@RequestBody StatisticsDeviceChannelDto dto){
List<DeviceInfoChannelEntity> deviceInfoChannelEntities =
deviceInfoChannelService.queryDeviceInfoChannelByChannelId(dto.getChannelId());
List<Long> querydeviceIds = new LinkedList<>();
deviceInfoChannelEntities.forEach(deviceInfoChannelEntity -> {
querydeviceIds.add(deviceInfoChannelEntity.getDeviceId());
});
List<DeviceInfoEntity> deviceInfoEntities =
deviceInfoService.queryDeviceByDeviceIdAndChannelRules(dto.getChannelRules(), querydeviceIds);
List<Long> deviceIds = new LinkedList<>();
deviceInfoEntities.forEach(deviceInfoEntity -> {
deviceIds.add(deviceInfoEntity.getDeviceId());
});
deviceInfoChannelService.removeDeivceInfoChannelByDeviceIdAndChannelId(dto.getChannelId(), deviceIds);
}
}
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java
......@@ -239,7 +239,7 @@ public class DeviceInfoController {
deviceInfoService.queryDeviceByImeis(imeis);
entities.forEach(deviceInfoEntity -> {
deviceIds.add(deviceInfoEntity.getDeptId());
deviceIds.add(deviceInfoEntity.getDeviceId());
if (deviceInfoEntity.getChannelRules() == null || deviceInfoEntity.getChannelRules() == 1){
ChannelSettingImeis.add(deviceInfoEntity.getImei());
}
......@@ -250,7 +250,7 @@ public class DeviceInfoController {
deviceInfoChannelEntities.forEach(deviceInfoChannelEntity -> {
entities.forEach(deviceInfoEntity -> {
if (deviceInfoEntity.getDeptId().equals(deviceInfoChannelEntity.getDeviceId())){
if (deviceInfoEntity.getDeviceId().equals(deviceInfoChannelEntity.getDeviceId())){
ChannelSettingImeis.add(deviceInfoEntity.getImei());
}
});
......@@ -293,7 +293,10 @@ public class DeviceInfoController {
});
}
deviceInfoService.updateBatchByImei(deviceInfoEntityList);
// TODO 把已经增加过的删除
deviceInfoChannelService.saveBatch(deviceChannelEntities);
return R.ok();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment