Skip to content

C
cneeds-server
Commit 993f725b by zzrdark
Options

1.add 产线上传 查询产线数据

parent 6daccf97
Showing with 248 additions and 124 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="">
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/codec/Invocation.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/codec/InvocationDecoder.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/codec/InvocationEncoder.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/codec/MessageToWebSocketEncoder.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/dispatcher/Message.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/dispatcher/MessageDispatcher.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/dispatcher/MessageHandler.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/dispatcher/MessageHandlerContainer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/json/WechatJsonMessage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/NettyServer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/NettyServerHandlerInitializer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/config/NettyChannelManager.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/config/NettyServerConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/handler/NettyServerHandler.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/handler/OperateWebsocketHandler.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/handler/auth/AuthRequestHandler.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/handler/chat/ChatSendToAllHandler.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/handler/chat/ChatSendToOneHandler.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/handler/heartbeat/HeartbeatRequestHandler.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/handler/wechat/WechatMessageHandler.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/auth/AuthRequest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/auth/AuthResponse.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/chat/ChatRedirectToUserRequest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/chat/ChatSendResponse.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/chat/ChatSendToAllRequest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/chat/ChatSendToOneRequest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/heartbeat/HeartbeatRequest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/heartbeat/HeartbeatResponse.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageRequest.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageResponse.java" afterDir="false" />
<list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.netty websocket 模块">
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/css/chunk-19adc003.9d63d053.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/app.31e1b5d6.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-19adc003.dd20cd1f.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/pom.xml" 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/DatashowApplication.java" 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/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/DeviceInfoDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DeviceInfoDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceInfoVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceInfoVo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.yml" 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/config/OAuth2ResourceServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.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/java/com/mx/cneeds/server/datashow/web/wechat/WechatController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/wechat/WechatController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-prod.yml" 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/java/com/mx/cneeds/server/wechat/common/json/WechatJsonMessage.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/json/WechatJsonMessage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageRequest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageResponse.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageResponse.java" 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/js/app.cd456023.js" beforeDir="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/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/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-logupload/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-logupload/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -104,6 +91,7 @@
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
......@@ -131,12 +119,12 @@
<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-server-datashow\target" />
<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" />
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\wechat\websocket\message\handler" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\wechat\websocket\message" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\wechat\common" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-common-data\src\main\resources\mapper" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.mx.cneeds.server.wechat.websocket.config" />
......@@ -145,25 +133,25 @@
<recent name="com.mx.cneeds.server.anthorization.client" />
<recent name="com.mx.cneeds.common.dto" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\wechat\websocket\message\handler" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\wechat\websocket\message" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\wechat\common" />
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\target" />
<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-data\src\main\resources\mapper" />
</key>
</component>
<component name="RestServicesNavigator">
<treeState>
<expand>
<path>
<item name="Found 158 services " type="fcff1e1b:RestServiceStructure$RootNode" />
<item name="Found 161 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" />
......@@ -419,21 +407,17 @@
<workItem from="1592547857998" duration="2327000" />
<workItem from="1592790194492" duration="4215000" />
<workItem from="1592880762759" duration="8692000" />
<workItem from="1592903612933" duration="11344000" />
</task>
<task id="LOCAL-00001" summary="1.修改不需要web服务 &#10;2.增加一个logupload">
<created>1578451117064</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1578451117064</updated>
</task>
<task id="LOCAL-00002" summary="1.增加持久层代码&#10;2.增加utils&#10;3.修改项目间依赖关系&#10;4.增加service、controller">
<created>1578559919076</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1578559919076</updated>
<workItem from="1592903612933" duration="11510000" />
<workItem from="1592966313549" duration="6312000" />
<workItem from="1592982539059" duration="2230000" />
<workItem from="1593310623290" duration="14256000" />
<workItem from="1593395271389" duration="14324000" />
<workItem from="1593481650848" duration="13055000" />
<workItem from="1593568584749" duration="11344000" />
<workItem from="1593653979285" duration="17198000" />
<workItem from="1593741949055" duration="4797000" />
<workItem from="1594004568927" duration="6634000" />
<workItem from="1594102134824" duration="1918000" />
</task>
<task id="LOCAL-00003" summary="1.add 依赖 common-io">
<created>1578576270648</created>
......@@ -764,7 +748,21 @@
<option name="project" value="LOCAL" />
<updated>1591960601000</updated>
</task>
<option name="localTasksCounter" value="50" />
<task id="LOCAL-00050" summary="1.netty websocket 模块">
<created>1592919262626</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1592919262626</updated>
</task>
<task id="LOCAL-00051" summary="1. 修改netty websocket 模块&#10;2. 修复渠道号管理">
<created>1593343266600</created>
<option name="number" value="00051" />
<option name="presentableId" value="LOCAL-00051" />
<option name="project" value="LOCAL" />
<updated>1593343266600</updated>
</task>
<option name="localTasksCounter" value="52" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -815,8 +813,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="1.fix" />
<MESSAGE value="1.add device log oos" />
<MESSAGE value="1.fix DeviceLog" />
<MESSAGE value="1.add logging&#10;2.增加 查询设备信息" />
<MESSAGE value="1.日志更改&#10;2.修改前端代码&#10;3.更改黑白名单编码&#10;4.增加logMedia 的fileSize" />
......@@ -840,7 +836,9 @@
<MESSAGE value="1.修改权限的字段" />
<MESSAGE value="1.修改渠道号模块等问题" />
<MESSAGE value="1.修改渠道号统计模块Bug" />
<option name="LAST_COMMIT_MESSAGE" value="1.修改渠道号统计模块Bug" />
<MESSAGE value="1.netty websocket 模块" />
<MESSAGE value="1. 修改netty websocket 模块&#10;2. 修复渠道号管理" />
<option name="LAST_COMMIT_MESSAGE" value="1. 修改netty websocket 模块&#10;2. 修复渠道号管理" />
</component>
<component name="WindowStateProjectService">
<state x="590" y="156" key="#LogUploadApplication" timestamp="1585894479679">
......@@ -859,82 +857,86 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="378" y="114" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1591587501395" />
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser" timestamp="1592918977305">
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser" timestamp="1593404486135">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1592918977305" />
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1593404486135" />
<state x="598" y="445" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1592897576506">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="598" y="445" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1592897576506" />
<state x="463" y="112" width="953" height="816" key="CommitChangelistDialog2" timestamp="1591960599388">
<state x="463" y="112" width="953" height="816" key="CommitChangelistDialog2" timestamp="1594108919055">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="463" y="112" width="953" height="816" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1591960599388" />
<state x="150" y="103" key="DiffContextDialog" timestamp="1591790865617">
<state x="463" y="112" width="953" height="816" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1594108919055" />
<state x="150" y="103" key="DiffContextDialog" timestamp="1594108901013">
<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="1591790865617" />
<state x="150" y="103" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594108901013" />
<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="372" key="GridCell.Tab.0.bottom" timestamp="1592919130384">
<state width="1877" height="278" key="GridCell.Tab.0.bottom" timestamp="1593773130220">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1592919130384" />
<state width="1877" height="372" key="GridCell.Tab.0.center" timestamp="1592919130384">
<state width="1877" height="278" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1593773130220" />
<state width="1877" height="278" key="GridCell.Tab.0.center" timestamp="1593773130220">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1592919130384" />
<state width="1877" height="372" key="GridCell.Tab.0.left" timestamp="1592919130384">
<state width="1877" height="278" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1593773130220" />
<state width="1877" height="278" key="GridCell.Tab.0.left" timestamp="1593773130220">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1592919130384" />
<state width="1877" height="372" key="GridCell.Tab.0.right" timestamp="1592919130384">
<state width="1877" height="278" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1593773130220" />
<state width="1877" height="278" key="GridCell.Tab.0.right" timestamp="1593773130220">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1592919130384" />
<state width="1877" height="372" key="GridCell.Tab.1.bottom" timestamp="1592919149648">
<state width="1877" height="278" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1593773130220" />
<state width="1877" height="305" key="GridCell.Tab.1.bottom" timestamp="1593697471153">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1592919149648" />
<state width="1877" height="372" key="GridCell.Tab.1.center" timestamp="1592919149648">
<state width="1877" height="305" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.1.center" timestamp="1593697471153">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1592919149648" />
<state width="1877" height="372" key="GridCell.Tab.1.left" timestamp="1592919149648">
<state width="1877" height="305" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.1.left" timestamp="1593697471153">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1592919149648" />
<state width="1877" height="372" key="GridCell.Tab.1.right" timestamp="1592919149648">
<state width="1877" height="305" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.1.right" timestamp="1593697471153">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1592919149648" />
<state width="1877" height="372" key="GridCell.Tab.2.bottom" timestamp="1592919130262">
<state width="1877" height="305" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.2.bottom" timestamp="1593697471153">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1592919130262" />
<state width="1877" height="372" key="GridCell.Tab.2.center" timestamp="1592919130262">
<state width="1877" height="305" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.2.center" timestamp="1593697471153">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1592919130262" />
<state width="1877" height="372" key="GridCell.Tab.2.left" timestamp="1592919130262">
<state width="1877" height="305" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.2.left" timestamp="1593697471153">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1592919130262" />
<state width="1877" height="372" key="GridCell.Tab.2.right" timestamp="1592919130262">
<state width="1877" height="305" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.2.right" timestamp="1593697471153">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="372" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1592919130262" />
<state width="1877" height="305" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state x="438" y="166" width="1352" height="708" key="SettingsEditor" timestamp="1591693189478">
<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="1591693189478" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1591960602280">
<state x="681" y="261" width="540" height="524" key="StructurePopup" timestamp="1594032962346">
<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="1591960602280" />
<state x="681" y="261" width="540" height="524" key="StructurePopup/0.0.1920.1040@0.0.1920.1040" timestamp="1594032962346" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1593343268370">
<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="1593343268370" />
<state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1585818529449">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......@@ -959,10 +961,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="627" y="368" width="672" height="676" key="search.everywhere.popup" timestamp="1592917797814">
<state x="72" y="301" width="672" height="676" key="search.everywhere.popup" timestamp="1594039843081">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="627" y="368" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1592917797814" />
<state x="72" y="301" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1594039843081" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -989,7 +991,7 @@
</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/wechat/WechatController.java</url>
<line>55</line>
<line>57</line>
<option name="timeStamp" value="42" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
......@@ -999,14 +1001,9 @@
</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>258</line>
<line>259</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/wechat/websocket/message/handler/wechat/WechatMessageHandler.java</url>
<line>31</line>
<option name="timeStamp" value="79" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
......
cneeds-common-data/db/cneeds_server.sql
......@@ -342,3 +342,14 @@ DROP COLUMN `channel_nums`;
-- 2020-05-14
ALTER TABLE `cneeds_server`.`device_log`
ADD COLUMN `device_version` varchar(255) COMMENT '设备版本号' AFTER `log_accept_id`;
-- 2020-06-29
ALTER TABLE `cneeds_server`.`device_info`
ADD COLUMN `sn` varchar(255) COMMENT 'sn号' AFTER `channel_rules`,
ADD COLUMN `ca_certificate_status` varchar(255) COMMENT 'ca证书状态 -1 未下载，0 已下载 类型：非量产 1 已下载 类型：量产，2 已下载 类型：非量产，未验证 3 已下载 类型：量产，未验证' AFTER `sn`;
ALTER TABLE `cneeds_server`.`device_info`
CHANGE COLUMN `status` `active_status` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci
DEFAULT NULL COMMENT '状态0未激活，1已激活' AFTER `iccid`;
\ No newline at end of file
cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoEntity.java
......@@ -42,9 +42,9 @@ public class DeviceInfoEntity implements Serializable {
private String iccid;
/**
* 状态0未激活，1已激活
* 状态 -1激活失败， 0未激活，1已激活
*/
private String status;
private String activeStatus;
/**
* 设备版本
......@@ -77,9 +77,20 @@ public class DeviceInfoEntity implements Serializable {
private Integer channelRules;
/**
* sn号
*/
private String sn;
/**
* ca证书状态
* 0未下载，1已下载
*/
private String caCertificateStatus;
/**
* 产品系列号
*/
@TableField( exist=false )
@TableField(exist=false)
private String seriesNum;
}
cneeds-common-data/src/main/resources/mapper/DeviceInfoDao.xml
......@@ -9,7 +9,7 @@
<result property="deptId" column="dept_id"/>
<result property="imei" column="imei"/>
<result property="iccid" column="iccid"/>
<result property="status" column="status"/>
<result property="activeStatus" column="active_status"/>
<result property="deviceVersion" column="device_version"/>
<result property="seriesId" column="series_id"/>
<result property="createTime" column="create_time"/>
......@@ -17,6 +17,8 @@
<result property="channelNumsMessage" column="channel_nums_message"/>
<result property="channelRules" column="channel_rules"/>
<result property="seriesNum" column="series_num"/>
<result property="caCertificateStatus" column="ca_certificate_status" />
<result property="sn" column="sn" />
</resultMap>
......
cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DeviceInfoDto.java
......@@ -37,7 +37,7 @@ public class DeviceInfoDto {
/**
* 状态0未激活，1已激活
*/
private String status;
private String activeStatus;
/**
* 设备版本
......@@ -84,4 +84,13 @@ public class DeviceInfoDto {
*/
private List<Long> channelIds;
/**
* sn号
*/
private String sn;
/**
* ca证书状态
*/
private String caCertificateStatus;
}
cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceInfoVo.java
......@@ -37,7 +37,7 @@ public class DeviceInfoVo {
/**
* 状态0未激活，1已激活
*/
private String status;
private String activeStatus;
/**
* 设备版本
......@@ -84,4 +84,15 @@ public class DeviceInfoVo {
*/
private List<Long> channelIds;
/**
* sn号
*/
private String sn;
/**
* ca证书状态
* 0未下载，1已下载
*/
private String caCertificateStatus;
}
cneeds-server-authorization/src/main/resources/application.yml
spring:
profiles:
active: dev
active: prod
application:
name: cneeds-server-authorization
server:
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java
......@@ -5,6 +5,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.Set;
......@@ -64,6 +65,9 @@ public interface DeviceClient {
@PostMapping("/device/info/updateDeviceSeriesBatch")
void updateDeviceSeriesBatch(@RequestBody DevicesDto dto);
@PostMapping("/device/info/updateByImei")
void updateDevice(@RequestBody DeviceInfoDto dto);
@PostMapping("/device/info/delete")
void deleteDevice(@RequestBody List<Long> ids);
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java
......@@ -23,6 +23,7 @@ public class OAuth2ResourceServer extends ResourceServerConfigurerAdapter {
http.authorizeRequests()
.antMatchers("/user/login",
"/device/device/getChannel_nums",
"/device/device/uploadNewDeviceInfo",
"/wechat/wechatFileUpload",
"/wechat/wechatDownload/**",
"/wechat/wechatMessageHttp",
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java
......@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.HttpHeaders;
......@@ -401,4 +402,30 @@ public class DeviceController {
return R.ok();
}
@RequestMapping("/device/uploadNewDeviceInfo")
public R uploadNewDeviceInfo(DeviceInfoVo vo){
if (vo.getImei() == null){
return R.error(ResultCode.PARAMERROR,"没有传入imei");
}
DeviceInfoDto dto = new DeviceInfoDto();
BeanUtils.copyProperties(vo,dto);
// 先检查是否有该imei设备 ，如果没有则返回没有该设备的状态码
DeviceInfoDto deviceInfoDto = deviceClient.queryDeviceByImei(vo.getImei());
if (deviceInfoDto == null){
return R.error(ResultCode.NOTFOUND_IMEI,"系统没有该设备");
}
// 再进行设置
deviceClient.updateDevice(dto);
return R.ok();
}
}
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/json/WechatJsonMessage.java
......@@ -68,6 +68,7 @@ public class WechatJsonMessage {
private String content;
private String fromGroup;
private String fromUser;
private int msgType;
private int msgId;
private long newMsgId;
private boolean self;
......@@ -77,6 +78,13 @@ public class WechatJsonMessage {
private Long voiceLength;
public int getMsgType() {
return msgType;
}
public void setMsgType(int msgType) {
this.msgType = msgType;
}
public String getContent() {
return content;
......@@ -142,11 +150,11 @@ public class WechatJsonMessage {
this.toUser = toUser;
}
public String getWId() {
public String getwId() {
return wId;
}
public void setWId(String wId) {
public void setwId(String wId) {
this.wId = wId;
}
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageRequest.java
......@@ -71,6 +71,7 @@ public class WechatMessageRequest implements Message {
private String content;
private String fromGroup;
private String fromUser;
private int msgType;
private int msgId;
private long newMsgId;
private boolean self;
......@@ -80,6 +81,13 @@ public class WechatMessageRequest implements Message {
private Long voiceLength;
public int getMsgType() {
return msgType;
}
public void setMsgType(int msgType) {
this.msgType = msgType;
}
public String getContent() {
return content;
......@@ -145,11 +153,11 @@ public class WechatMessageRequest implements Message {
this.toUser = toUser;
}
public String getWId() {
public String getwId() {
return wId;
}
public void setWId(String wId) {
public void setwId(String wId) {
this.wId = wId;
}
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageResponse.java
......@@ -61,6 +61,7 @@ public class WechatMessageResponse implements Message {
private String fromGroup;
private String fromUser;
private int msgId;
private int msgType;
private long newMsgId;
private boolean self;
private int timestamp;
......@@ -68,7 +69,13 @@ public class WechatMessageResponse implements Message {
private String wId;
private Long voiceLength;
public int getMsgType() {
return msgType;
}
public void setMsgType(int msgType) {
this.msgType = msgType;
}
public String getContent() {
return content;
......@@ -134,11 +141,11 @@ public class WechatMessageResponse implements Message {
this.toUser = toUser;
}
public String getWId() {
public String getwId() {
return wId;
}
public void setWId(String wId) {
public void setwId(String wId) {
this.wId = wId;
}
......
cneeds-server-datashow/src/main/resources/statics/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=./favicon.ico><title>springSecurity登陆demo</title><link href=static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=static/css/app.826c7dc3.css rel=stylesheet></head><body><div id=app></div><script src=static/js/chunk-elementUI.a6c12691.js></script><script src=static/js/chunk-libs.ddf89aa7.js></script><script>(function(e){function c(c){for(var u,t,d=c[0],f=c[1],h=c[2],o=0,k=[];o<d.length;o++)t=d[o],a[t]&&k.push(a[t][0]),a[t]=0;for(u in f)Object.prototype.hasOwnProperty.call(f,u)&&(e[u]=f[u]);b&&b(c);while(k.length)k.shift()();return r.push.apply(r,h||[]),n()}function n(){for(var e,c=0;c<r.length;c++){for(var n=r[c],u=!0,t=1;t<n.length;t++){var d=n[t];0!==a[d]&&(u=!1)}u&&(r.splice(c--,1),e=f(f.s=n[0]))}return e}var u={},t={runtime:0},a={runtime:0},r=[];function d(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-06aa7494":"994ce320","chunk-06ed166b":"66da71fe","chunk-116c2bab":"5a43279b","chunk-18a40ee2":"fdc75ed7","chunk-1a07b08b":"a4648995","chunk-218bb4cf":"ad8939a9","chunk-22e5f704":"120c5aba","chunk-2b4823a9":"d42464b2","chunk-2d2105d3":"c38e1553","chunk-2d230a36":"a16402ea","chunk-2d230fe7":"8023f254","chunk-3b59103a":"e05b61e6","chunk-403c80dd":"dea3dfbd","chunk-47af9ee4":"c49c140c","chunk-4a8d06a6":"9921a763","chunk-4ab8490a":"29b8a83b","chunk-5411756c":"a32521df","chunk-56d3065a":"f080c714","chunk-10f36354":"c3d7a43b","chunk-5c585ee6":"98c0af9d","chunk-636f8118":"4eebe991","chunk-64238bd4":"9fe6b6fa","chunk-6e87ca78":"cc2ed628","chunk-4b016116":"78605b5f","chunk-723f6b88":"76a00cb9","chunk-7395e3e5":"460bb71c","chunk-73bfcbf0":"9235c05b","chunk-77a4bbf0":"401dbd73","chunk-79a85582":"a51950d9","chunk-7b66cc0a":"812cc3d5","chunk-80fe6032":"a96f29c2","chunk-adf11d7e":"abaa689d","chunk-e20529e6":"feb50403","chunk-e33fc590":"d95898ad","chunk-e652b80c":"b8ebf477"}[e]+".js"}function f(c){if(u[c])return u[c].exports;var n=u[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,f),n.l=!0,n.exports}f.e=function(e){var c=[],n={"chunk-06aa7494":1,"chunk-116c2bab":1,"chunk-18a40ee2":1,"chunk-1a07b08b":1,"chunk-218bb4cf":1,"chunk-2b4823a9":1,"chunk-4a8d06a6":1,"chunk-4ab8490a":1,"chunk-5411756c":1,"chunk-10f36354":1,"chunk-64238bd4":1,"chunk-4b016116":1,"chunk-723f6b88":1,"chunk-80fe6032":1,"chunk-adf11d7e":1,"chunk-e33fc590":1};t[e]?c.push(t[e]):0!==t[e]&&n[e]&&c.push(t[e]=new Promise((function(c,n){for(var u="static/css/"+({}[e]||e)+"."+{"chunk-06aa7494":"9d63d053","chunk-06ed166b":"31d6cfe0","chunk-116c2bab":"eedc5334","chunk-18a40ee2":"9d63d053","chunk-1a07b08b":"830e1851","chunk-218bb4cf":"9d63d053","chunk-22e5f704":"31d6cfe0","chunk-2b4823a9":"9d63d053","chunk-2d2105d3":"31d6cfe0","chunk-2d230a36":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-3b59103a":"31d6cfe0","chunk-403c80dd":"31d6cfe0","chunk-47af9ee4":"31d6cfe0","chunk-4a8d06a6":"e9a4618c","chunk-4ab8490a":"9d63d053","chunk-5411756c":"9d63d053","chunk-56d3065a":"31d6cfe0","chunk-10f36354":"129625a4","chunk-5c585ee6":"31d6cfe0","chunk-636f8118":"31d6cfe0","chunk-64238bd4":"70564041","chunk-6e87ca78":"31d6cfe0","chunk-4b016116":"4aec73c5","chunk-723f6b88":"53ac87fa","chunk-7395e3e5":"31d6cfe0","chunk-73bfcbf0":"31d6cfe0","chunk-77a4bbf0":"31d6cfe0","chunk-79a85582":"31d6cfe0","chunk-7b66cc0a":"31d6cfe0","chunk-80fe6032":"9d63d053","chunk-adf11d7e":"9d63d053","chunk-e20529e6":"31d6cfe0","chunk-e33fc590":"9d63d053","chunk-e652b80c":"31d6cfe0"}[e]+".css",a=f.p+u,r=document.getElementsByTagName("link"),d=0;d<r.length;d++){var h=r[d],o=h.getAttribute("data-href")||h.getAttribute("href");if("stylesheet"===h.rel&&(o===u||o===a))return c()}var k=document.getElementsByTagName("style");for(d=0;d<k.length;d++){h=k[d],o=h.getAttribute("data-href");if(o===u||o===a)return c()}var b=document.createElement("link");b.rel="stylesheet",b.type="text/css",b.onload=c,b.onerror=function(c){var u=c&&c.target&&c.target.src||a,r=new Error("Loading CSS chunk "+e+" failed.\n("+u+")");r.request=u,delete t[e],b.parentNode.removeChild(b),n(r)},b.href=a;var i=document.getElementsByTagName("head")[0];i.appendChild(b)})).then((function(){t[e]=0})));var u=a[e];if(0!==u)if(u)c.push(u[2]);else{var r=new Promise((function(c,n){u=a[e]=[c,n]}));c.push(u[2]=r);var h,o=document.createElement("script");o.charset="utf-8",o.timeout=120,f.nc&&o.setAttribute("nonce",f.nc),o.src=d(e),h=function(c){o.onerror=o.onload=null,clearTimeout(k);var n=a[e];if(0!==n){if(n){var u=c&&("load"===c.type?"missing":c.type),t=c&&c.target&&c.target.src,r=new Error("Loading chunk "+e+" failed.\n("+u+": "+t+")");r.type=u,r.request=t,n[1](r)}a[e]=void 0}};var k=setTimeout((function(){h({type:"timeout",target:o})}),12e4);o.onerror=o.onload=h,document.head.appendChild(o)}return Promise.all(c)},f.m=e,f.c=u,f.d=function(e,c,n){f.o(e,c)||Object.defineProperty(e,c,{enumerable:!0,get:n})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,c){if(1&c&&(e=f(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(f.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var u in e)f.d(n,u,function(c){return e[c]}.bind(null,u));return n},f.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="",f.oe=function(e){throw console.error(e),e};var h=window["webpackJsonp"]=window["webpackJsonp"]||[],o=h.push.bind(h);h.push=c,h=h.slice();for(var k=0;k<h.length;k++)c(h[k]);var b=o;n()})([]);</script><script src=static/js/app.cd456023.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=./favicon.ico><title>springSecurity登陆demo</title><link href=static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=static/css/app.826c7dc3.css rel=stylesheet></head><body><div id=app></div><script src=static/js/chunk-elementUI.a6c12691.js></script><script src=static/js/chunk-libs.ddf89aa7.js></script><script>(function(e){function c(c){for(var u,a,d=c[0],h=c[1],f=c[2],o=0,k=[];o<d.length;o++)a=d[o],t[a]&&k.push(t[a][0]),t[a]=0;for(u in h)Object.prototype.hasOwnProperty.call(h,u)&&(e[u]=h[u]);b&&b(c);while(k.length)k.shift()();return r.push.apply(r,f||[]),n()}function n(){for(var e,c=0;c<r.length;c++){for(var n=r[c],u=!0,a=1;a<n.length;a++){var d=n[a];0!==t[d]&&(u=!1)}u&&(r.splice(c--,1),e=h(h.s=n[0]))}return e}var u={},a={runtime:0},t={runtime:0},r=[];function d(e){return h.p+"static/js/"+({}[e]||e)+"."+{"chunk-06aa7494":"994ce320","chunk-06ed166b":"66da71fe","chunk-116c2bab":"5a43279b","chunk-18a40ee2":"fdc75ed7","chunk-19adc003":"dd20cd1f","chunk-1a07b08b":"a4648995","chunk-218bb4cf":"ad8939a9","chunk-22e5f704":"120c5aba","chunk-2b4823a9":"d42464b2","chunk-2d2105d3":"c38e1553","chunk-2d230a36":"a16402ea","chunk-2d230fe7":"8023f254","chunk-3b59103a":"e05b61e6","chunk-403c80dd":"dea3dfbd","chunk-47af9ee4":"c49c140c","chunk-4a8d06a6":"9921a763","chunk-4ab8490a":"29b8a83b","chunk-5411756c":"a32521df","chunk-56d3065a":"f080c714","chunk-10f36354":"c3d7a43b","chunk-5c585ee6":"98c0af9d","chunk-636f8118":"4eebe991","chunk-64238bd4":"9fe6b6fa","chunk-6e87ca78":"cc2ed628","chunk-4b016116":"78605b5f","chunk-723f6b88":"76a00cb9","chunk-7395e3e5":"460bb71c","chunk-73bfcbf0":"9235c05b","chunk-77a4bbf0":"401dbd73","chunk-79a85582":"a51950d9","chunk-7b66cc0a":"812cc3d5","chunk-80fe6032":"a96f29c2","chunk-adf11d7e":"abaa689d","chunk-e20529e6":"feb50403","chunk-e33fc590":"d95898ad","chunk-e652b80c":"b8ebf477"}[e]+".js"}function h(c){if(u[c])return u[c].exports;var n=u[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,h),n.l=!0,n.exports}h.e=function(e){var c=[],n={"chunk-06aa7494":1,"chunk-116c2bab":1,"chunk-18a40ee2":1,"chunk-19adc003":1,"chunk-1a07b08b":1,"chunk-218bb4cf":1,"chunk-2b4823a9":1,"chunk-4a8d06a6":1,"chunk-4ab8490a":1,"chunk-5411756c":1,"chunk-10f36354":1,"chunk-64238bd4":1,"chunk-4b016116":1,"chunk-723f6b88":1,"chunk-80fe6032":1,"chunk-adf11d7e":1,"chunk-e33fc590":1};a[e]?c.push(a[e]):0!==a[e]&&n[e]&&c.push(a[e]=new Promise((function(c,n){for(var u="static/css/"+({}[e]||e)+"."+{"chunk-06aa7494":"9d63d053","chunk-06ed166b":"31d6cfe0","chunk-116c2bab":"eedc5334","chunk-18a40ee2":"9d63d053","chunk-19adc003":"9d63d053","chunk-1a07b08b":"830e1851","chunk-218bb4cf":"9d63d053","chunk-22e5f704":"31d6cfe0","chunk-2b4823a9":"9d63d053","chunk-2d2105d3":"31d6cfe0","chunk-2d230a36":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-3b59103a":"31d6cfe0","chunk-403c80dd":"31d6cfe0","chunk-47af9ee4":"31d6cfe0","chunk-4a8d06a6":"e9a4618c","chunk-4ab8490a":"9d63d053","chunk-5411756c":"9d63d053","chunk-56d3065a":"31d6cfe0","chunk-10f36354":"129625a4","chunk-5c585ee6":"31d6cfe0","chunk-636f8118":"31d6cfe0","chunk-64238bd4":"70564041","chunk-6e87ca78":"31d6cfe0","chunk-4b016116":"4aec73c5","chunk-723f6b88":"53ac87fa","chunk-7395e3e5":"31d6cfe0","chunk-73bfcbf0":"31d6cfe0","chunk-77a4bbf0":"31d6cfe0","chunk-79a85582":"31d6cfe0","chunk-7b66cc0a":"31d6cfe0","chunk-80fe6032":"9d63d053","chunk-adf11d7e":"9d63d053","chunk-e20529e6":"31d6cfe0","chunk-e33fc590":"9d63d053","chunk-e652b80c":"31d6cfe0"}[e]+".css",t=h.p+u,r=document.getElementsByTagName("link"),d=0;d<r.length;d++){var f=r[d],o=f.getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(o===u||o===t))return c()}var k=document.getElementsByTagName("style");for(d=0;d<k.length;d++){f=k[d],o=f.getAttribute("data-href");if(o===u||o===t)return c()}var b=document.createElement("link");b.rel="stylesheet",b.type="text/css",b.onload=c,b.onerror=function(c){var u=c&&c.target&&c.target.src||t,r=new Error("Loading CSS chunk "+e+" failed.\n("+u+")");r.request=u,delete a[e],b.parentNode.removeChild(b),n(r)},b.href=t;var i=document.getElementsByTagName("head")[0];i.appendChild(b)})).then((function(){a[e]=0})));var u=t[e];if(0!==u)if(u)c.push(u[2]);else{var r=new Promise((function(c,n){u=t[e]=[c,n]}));c.push(u[2]=r);var f,o=document.createElement("script");o.charset="utf-8",o.timeout=120,h.nc&&o.setAttribute("nonce",h.nc),o.src=d(e),f=function(c){o.onerror=o.onload=null,clearTimeout(k);var n=t[e];if(0!==n){if(n){var u=c&&("load"===c.type?"missing":c.type),a=c&&c.target&&c.target.src,r=new Error("Loading chunk "+e+" failed.\n("+u+": "+a+")");r.type=u,r.request=a,n[1](r)}t[e]=void 0}};var k=setTimeout((function(){f({type:"timeout",target:o})}),12e4);o.onerror=o.onload=f,document.head.appendChild(o)}return Promise.all(c)},h.m=e,h.c=u,h.d=function(e,c,n){h.o(e,c)||Object.defineProperty(e,c,{enumerable:!0,get:n})},h.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},h.t=function(e,c){if(1&c&&(e=h(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(h.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var u in e)h.d(n,u,function(c){return e[c]}.bind(null,u));return n},h.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return h.d(c,"a",c),c},h.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},h.p="",h.oe=function(e){throw console.error(e),e};var f=window["webpackJsonp"]=window["webpackJsonp"]||[],o=f.push.bind(f);f.push=c,f=f.slice();for(var k=0;k<f.length;k++)c(f[k]);var b=o;n()})([]);</script><script src=static/js/app.31e1b5d6.js></script></body></html>
\ No newline at end of file
cneeds-server-datashow/src/main/resources/statics/static/css/chunk-19adc003.9d63d053.css 0 → 100644
.pagination-container[data-v-f3b72548]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-f3b72548]{display:none}.waves-ripple{position:absolute;border-radius:100%;background-color:rgba(0,0,0,.15);background-clip:padding-box;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transform:scale(0);transform:scale(0);opacity:1}.waves-ripple.z-active{opacity:0;-webkit-transform:scale(2);transform:scale(2);-webkit-transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out,-webkit-transform .6s ease-out}
\ No newline at end of file
cneeds-server-datashow/src/main/resources/statics/static/js/chunk-19adc003.dd20cd1f.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-19adc003"],{"1c64":function(e,t,n){},"1cc6":function(e,t,n){"use strict";var i=n("1c64"),a=n.n(i);a.a},"333d":function(e,t,n){"use strict";var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"pagination-container",class:{hidden:e.hidden}},[n("el-pagination",e._b({attrs:{background:e.background,"current-page":e.currentPage,"page-size":e.pageSize,layout:e.layout,"page-sizes":e.pageSizes,total:e.total},on:{"update:currentPage":function(t){e.currentPage=t},"update:current-page":function(t){e.currentPage=t},"update:pageSize":function(t){e.pageSize=t},"update:page-size":function(t){e.pageSize=t},"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}},"el-pagination",e.$attrs,!1))],1)},a=[];n("c5f6");Math.easeInOutQuad=function(e,t,n,i){return e/=i/2,e<1?n/2*e*e+t:(e--,-n/2*(e*(e-2)-1)+t)};var r=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||function(e){window.setTimeout(e,1e3/60)}}();function o(e){document.documentElement.scrollTop=e,document.body.parentNode.scrollTop=e,document.body.scrollTop=e}function c(){return document.documentElement.scrollTop||document.body.parentNode.scrollTop||document.body.scrollTop}function l(e,t,n){var i=c(),a=e-i,l=20,u=0;t="undefined"===typeof t?500:t;var s=function e(){u+=l;var c=Math.easeInOutQuad(u,i,a,t);o(c),u<t?r(e):n&&"function"===typeof n&&n()};s()}var u={name:"Pagination",props:{total:{required:!0,type:Number},page:{type:Number,default:1},limit:{type:Number,default:20},pageSizes:{type:Array,default:function(){return[10,20,30,50]}},layout:{type:String,default:"total, sizes, prev, pager, next, jumper"},background:{type:Boolean,default:!0},autoScroll:{type:Boolean,default:!0},hidden:{type:Boolean,default:!1}},computed:{currentPage:{get:function(){return this.page},set:function(e){this.$emit("update:page",e)}},pageSize:{get:function(){return this.limit},set:function(e){this.$emit("update:limit",e)}}},methods:{handleSizeChange:function(e){this.$emit("pagination",{page:this.currentPage,limit:e}),this.autoScroll&&l(0,800)},handleCurrentChange:function(e){this.$emit("pagination",{page:e,limit:this.pageSize}),this.autoScroll&&l(0,800)}}},s=u,d=(n("1cc6"),n("2877")),p=Object(d["a"])(s,i,a,!1,null,"f3b72548",null);t["a"]=p.exports},"7d09":function(e,t,n){"use strict";n.d(t,"e",(function(){return a})),n.d(t,"a",(function(){return r})),n.d(t,"c",(function(){return o})),n.d(t,"b",(function(){return c})),n.d(t,"d",(function(){return l}));n("55dd");var i=n("b775");function a(e){return Object(i["a"])({url:"/device/series/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort,seriesNum:e.seriesNum}})}function r(e){return Object(i["a"])({url:"/device/series/add",method:"post",data:e})}function o(e){return Object(i["a"])({url:"/device/series/edit",method:"post",data:e})}function c(e){return Object(i["a"])({url:"/device/series/delete",method:"post",data:{ids:e}})}function l(){return Object(i["a"])({url:"/device/series/listAll",method:"post"})}},"8d41":function(e,t,n){},aa98:function(e,t,n){"use strict";n.d(t,"g",(function(){return a})),n.d(t,"h",(function(){return r})),n.d(t,"n",(function(){return o})),n.d(t,"b",(function(){return c})),n.d(t,"p",(function(){return l})),n.d(t,"l",(function(){return u})),n.d(t,"j",(function(){return s})),n.d(t,"f",(function(){return d})),n.d(t,"a",(function(){return p})),n.d(t,"m",(function(){return f})),n.d(t,"i",(function(){return h})),n.d(t,"c",(function(){return v})),n.d(t,"d",(function(){return m})),n.d(t,"o",(function(){return g})),n.d(t,"k",(function(){return b})),n.d(t,"e",(function(){return y}));n("55dd");var i=n("b775");function a(e){return Object(i["a"])({url:"/device/device/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort,seriesId:e.seriesId,imei:e.imei}})}function r(e){return Object(i["a"])({url:"/device/device/importDevice",method:"post",data:e})}function o(e){return Object(i["a"])({url:"/device/device/updateDeviceSeriesBatch",method:"post",data:e})}function c(e){return Object(i["a"])({url:"/device/device/delete",method:"post",data:{ids:e}})}function l(e){return Object(i["a"])({url:"/device/device/uploadDeivceChannelExcel",method:"post",data:e,headers:{"Content-Type":"application/json;charset=UTF-8"}})}function u(e){return Object(i["a"])({url:"/device/device/saveChannel",method:"post",data:e})}function s(e){return Object(i["a"])({url:"/device/device/queryDeviceChannelSetting",method:"post",data:e})}function d(e){return Object(i["a"])({url:"/device/deviceChannel/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort,channelNum:e.channelNum}})}function p(e){return Object(i["a"])({url:"/device/deviceChannel/add",method:"post",data:e})}function f(e){return Object(i["a"])({url:"/device/deviceChannel/edit",method:"post",data:e})}function h(){return Object(i["a"])({url:"/device/deviceChannel/queryDeviceChannelAll",method:"post"})}function v(e){return Object(i["a"])({url:"/device/deviceChannel/delete",method:"post",data:{ids:e}})}function m(e){return Object(i["a"])({url:"/device/deviceChannel/deleteSettingDeviceChannel",method:"post",data:{deviceId:e}})}function g(e){return Object(i["a"])({url:"/device/deviceChannel/updateSettingDeviceChannel",method:"post",data:e})}function b(e){return Object(i["a"])({url:"/device/deviceChannel/queryTotalStatisticsDeviceChannel",method:"post",data:{channelIds:e}})}function y(e){return Object(i["a"])({url:"/device/deviceChannel/deleteStatisticsDeviceChannel",method:"post",data:e})}},c7a7:function(e,t,n){"use strict";n("8d41");var i="@@wavesContext";function a(e,t){function n(n){var i=Object.assign({},t.value),a=Object.assign({ele:e,type:"hit",color:"rgba(0, 0, 0, 0.15)"},i),r=a.ele;if(r){r.style.position="relative",r.style.overflow="hidden";var o=r.getBoundingClientRect(),c=r.querySelector(".waves-ripple");switch(c?c.className="waves-ripple":(c=document.createElement("span"),c.className="waves-ripple",c.style.height=c.style.width=Math.max(o.width,o.height)+"px",r.appendChild(c)),a.type){case"center":c.style.top=o.height/2-c.offsetHeight/2+"px",c.style.left=o.width/2-c.offsetWidth/2+"px";break;default:c.style.top=(n.pageY-o.top-c.offsetHeight/2-document.documentElement.scrollTop||document.body.scrollTop)+"px",c.style.left=(n.pageX-o.left-c.offsetWidth/2-document.documentElement.scrollLeft||document.body.scrollLeft)+"px"}return c.style.backgroundColor=a.color,c.className="waves-ripple z-active",!1}}return e[i]?e[i].removeHandle=n:e[i]={removeHandle:n},n}t["a"]={bind:function(e,t){e.addEventListener("click",a(e,t),!1)},update:function(e,t){e.removeEventListener("click",e[i].removeHandle,!1),e.addEventListener("click",a(e,t),!1)},unbind:function(e){e.removeEventListener("click",e[i].removeHandle,!1),e[i]=null,delete e[i]}}},f547:function(e,t,n){"use strict";n.r(t);var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-container",[n("el-header",[n("div",{staticStyle:{margin:"20px 0"}},[n("el-select",{attrs:{clearable:"",placeholder:"请选择系列号"},model:{value:e.listQuery.seriesId,callback:function(t){e.$set(e.listQuery,"seriesId",t)},expression:"listQuery.seriesId"}},e._l(e.selectSeriesOptions,(function(e){return n("el-option",{key:e.seriesId,attrs:{label:e.seriesNum,value:e.seriesId}})})),1),e._v(" "),n("el-input",{staticClass:"filter-item",staticStyle:{width:"200px"},attrs:{placeholder:"输入imei",clearable:""},on:{clear:e.handleFilter,blur:e.handleFilter},nativeOn:{keyup:function(t){return!t.type.indexOf("key")&&e._k(t.keyCode,"enter",13,t.key,"Enter")?null:e.handleFilter(t)}},model:{value:e.listQuery.imei,callback:function(t){e.$set(e.listQuery,"imei",t)},expression:"listQuery.imei"}}),e._v(" "),n("el-button",{directives:[{name:"waves",rawName:"v-waves"}],staticClass:"filter-item",staticStyle:{"margin-left":"10px"},attrs:{type:"primary",icon:"el-icon-search"},on:{click:e.handleFilter}},[e._v("\n 查询\n ")])],1)]),e._v(" "),n("el-main",[n("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.listLoading,expression:"listLoading"}],key:e.tableKey,staticStyle:{width:"100%"},attrs:{data:e.list,border:"",fit:"","highlight-current-row":"","default-sort":e.defaultSort},on:{"sort-change":e.sortChange,"selection-change":e.handleSelectionChange}},[n("el-table-column",{attrs:{type:"selection",width:"55"}}),e._v(" "),n("el-table-column",{attrs:{label:"设备ID",prop:"deviceId",sortable:"custom",align:"center",width:"80"}}),e._v(" "),n("el-table-column",{attrs:{label:"产品系列",prop:"seriesNum",width:"150",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"imei",prop:"imei",width:"150",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"iccid",prop:"iccid",width:"150",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"sn",prop:"sn",width:"150",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"证书下载状态",prop:"caCertificateStatus",width:"150",align:"center"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row.caCertificateStatus;return[n("span",[e._v(e._s(e._f("caCertificateStatusFilter")(i)))])]}}])}),e._v(" "),n("el-table-column",{attrs:{label:"版本信息",prop:"deviceVersion",width:"150",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"激活状态",prop:"activeStatus",width:"150",align:"center"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row.activeStatus;return[n("span",[e._v(e._s(e._f("activeStatusFilter")(i)))])]}}])}),e._v(" "),n("el-table-column",{attrs:{label:"激活时间",prop:"activeTime",width:"100",align:"center"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row.activeTime;return[n("span",[e._v(e._s(e._f("timeFilter")(i)))])]}}])}),e._v(" "),n("el-table-column",{attrs:{label:"创建时间",prop:"createTime",width:"100",align:"center"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row.createTime;return[n("span",[e._v(e._s(e._f("timeFilter")(i)))])]}}])})],1),e._v(" "),n("pagination",{directives:[{name:"show",rawName:"v-show",value:e.total>0,expression:"total > 0"}],attrs:{total:e.total,page:e.listQuery.page,limit:e.listQuery.pageSize},on:{"update:page":function(t){return e.$set(e.listQuery,"page",t)},"update:limit":function(t){return e.$set(e.listQuery,"pageSize",t)},pagination:e.refresh}})],1)],1)},a=[],r=(n("96cf"),n("3b8d")),o=n("333d"),c=n("c7a7"),l=n("ed08"),u=n("aa98"),s=n("7d09"),d={components:{Pagination:o["a"]},directives:{waves:c["a"]},filters:{caCertificateStatusFilter:function(e){return"0"===e?"未下载":"1"===e?"已下载":e||"无信息"},activeStatusFilter:function(e){return"0"===e?"未激活":"1"===e?"已激活":e||"无信息"},valueFilter:function(e){return e||"无"},timeFilter:function(e){return e?Object(l["d"])(e,"{y}-{m}-{d} {h}:{i}"):"无"}},data:function(){return{tableKey:0,listLoading:!0,listQuery:{pageSize:10},list:[],total:0,defaultSort:{},multipleSelection:[],device:{imei:""},deviceIds:[],selectSeriesOptions:[]}},created:function(){},mounted:function(){this.selectSeries(),this.getList()},beforeRouteUpdate:function(e,t,n){if(e.path===t.path){var i=Object.assign({},e.query),a=Object.assign({},t.query);JSON.stringify(i)!==JSON.stringify(a)&&this.getList()}n()},methods:{handleSelectionChange:function(e){this.multipleSelection=e},sortChange:function(e){console.log("sortChange",e);var t=e.prop,n=e.order;this.sortBy(t,n)},sortBy:function(e,t){this.listQuery.sort="ascending"===t?"+".concat(e):"-".concat(e),this.handleFilter()},getList:function(){var e=this;this.listLoading=!0,Object(u["g"])(this.listQuery).then((function(t){var n=t.data,i=n.list,a=n.totalCount;e.list=i,e.total=a,e.listLoading=!1}))},refresh:function(){this.$router.push({path:"/deviceManagement/device",query:this.listQuery})},handleFilter:function(){console.log("handleFilter",this.listQuery),this.listQuery.page=1,this.refresh()},selectSeries:function(){var e=Object(r["a"])(regeneratorRuntime.mark((function e(){var t=this;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,Object(s["d"])().then((function(e){var n=e.data;t.selectSeriesOptions=n}));case 2:case"end":return e.stop()}}),e)})));function t(){return e.apply(this,arguments)}return t}()}},p=d,f=n("2877"),h=Object(f["a"])(p,i,a,!1,null,"098c36d7",null);t["default"]=h.exports}}]);
\ No newline at end of file
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java
......@@ -28,5 +28,7 @@ public interface DeviceInfoService extends IService<DeviceInfoEntity> {
List<DeviceInfoEntity> queryDeviceByIds(Set<Long> ids);
List<DeviceInfoEntity> queryDeviceByDeviceIdAndChannelRules(Integer channelRules, List<Long> deviceIds);
void updateByImei(DeviceInfoEntity deviceInfoEntity);
}
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java
......@@ -104,5 +104,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoDao, DeviceInfo
return deviceInfoEntities;
}
@Override
public void updateByImei(DeviceInfoEntity deviceInfoEntity) {
getBaseMapper().update(deviceInfoEntity,new QueryWrapper<DeviceInfoEntity>().eq("imei",deviceInfoEntity.getImei()));
}
}
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java
......@@ -171,7 +171,20 @@ public class DeviceInfoController {
public R update(@RequestBody DeviceInfoEntity deviceInfo){
ValidatorUtils.validateEntity(deviceInfo);
deviceInfoService.updateById(deviceInfo);
return R.ok();
}
/**
* 修改
*/
@RequestMapping("/updateByImei")
public R updateByImei(@RequestBody DeviceInfoDto dto){
DeviceInfoEntity deviceInfo = new DeviceInfoEntity();
BeanUtils.copyProperties(dto,deviceInfo);
ValidatorUtils.validateEntity(deviceInfo);
deviceInfoService.updateByImei(deviceInfo);
return R.ok();
}
......@@ -355,4 +368,7 @@ public class DeviceInfoController {
});
deviceInfoChannelService.saveBatch(deviceInfoChannelEntityList);
}
}
cneeds-server-logupload/src/main/resources/application.yml
spring:
profiles:
active: dev
active: prod
application:
name: cneeds-server-logupload
......
cneeds-server-user/src/main/resources/application.yml
spring:
profiles:
active: dev
active: prod
application:
name: cneeds-server-user
......
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