新增 后管第三方平台配置页面

jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyPlatformConfigController.java

@@ -1,8 +1,11 @@
-package com.jsowell.web.controller.pile;
+package com.jsowell.web.controller.thirdparty;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.jsowell.common.util.poi.ExcelUtil;
+import com.jsowell.pile.domain.ThirdPartyPlatformConfig;
+import com.jsowell.pile.service.IThirdPartyPlatformConfigService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,9 +20,6 @@ import com.jsowell.common.annotation.Log;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.domain.AjaxResult;
 import com.jsowell.common.enums.BusinessType;
-import com.jsowell.pile.domain.ThirdPartyPlatformConfig;
-import com.jsowell.pile.service.IThirdPartyPlatformConfigService;
-import com.jsowell.common.util.poi.ExcelUtil;
 import com.jsowell.common.core.page.TableDataInfo;
 
 /**
@@ -29,7 +29,7 @@ import com.jsowell.common.core.page.TableDataInfo;
  * @date 2023-05-27
  */
 @RestController
-@RequestMapping("/pile/config")
+@RequestMapping("/thirdParty/thirdPartyConfig")
 public class ThirdPartyPlatformConfigController extends BaseController {
     @Autowired
     private IThirdPartyPlatformConfigService thirdPartyPlatformConfigService;
@@ -37,7 +37,7 @@ public class ThirdPartyPlatformConfigController extends BaseController {
     /**
      * 查询对接平台配置信息列表
      */
-    @PreAuthorize("@ss.hasPermi('pile:config:list')")
+    @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartyConfig:list')")
     @GetMapping("/list")
     public TableDataInfo list(ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
         startPage();
@@ -48,7 +48,7 @@ public class ThirdPartyPlatformConfigController extends BaseController {
     /**
      * 导出对接平台配置信息列表
      */
-    @PreAuthorize("@ss.hasPermi('pile:config:export')")
+    @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartyConfig:export')")
     @Log(title = "对接平台配置信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
@@ -60,7 +60,7 @@ public class ThirdPartyPlatformConfigController extends BaseController {
     /**
      * 获取对接平台配置信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('pile:config:query')")
+    @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartyConfig:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id) {
         return AjaxResult.success(thirdPartyPlatformConfigService.selectThirdPartyPlatformConfigById(id));
@@ -69,7 +69,7 @@ public class ThirdPartyPlatformConfigController extends BaseController {
     /**
      * 新增对接平台配置信息
      */
-    @PreAuthorize("@ss.hasPermi('pile:config:add')")
+    @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartyConfig:add')")
     @Log(title = "对接平台配置信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
@@ -79,7 +79,7 @@ public class ThirdPartyPlatformConfigController extends BaseController {
     /**
      * 修改对接平台配置信息
      */
-    @PreAuthorize("@ss.hasPermi('pile:config:edit')")
+    @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartyConfig:edit')")
     @Log(title = "对接平台配置信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ThirdPartyPlatformConfig thirdPartyPlatformConfig) {
@@ -89,7 +89,7 @@ public class ThirdPartyPlatformConfigController extends BaseController {
     /**
      * 删除对接平台配置信息
      */
-    @PreAuthorize("@ss.hasPermi('pile:config:remove')")
+    @PreAuthorize("@ss.hasPermi('thirdParty:thirdPartyConfig:remove')")
     @Log(title = "对接平台配置信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids) {

jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java

@@ -315,11 +315,11 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
 			// 推送第三方平台，先通过桩编号查出站点信息
 			PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn);
 
-			Map<String, String> pileStatusMap = pileConnectorInfoService.getPileStatus(Lists.newArrayList(pileSn));
-			String pileStatus = pileStatusMap.get(pileSn);
-			if (StringUtils.equals(connectorStatus, pileStatus)) {
-				return null;
-			}
+			// Map<String, String> pileStatusMap = pileConnectorInfoService.getPileStatus(Lists.newArrayList(pileSn));
+			// String pileStatus = pileStatusMap.get(pileSn);
+			// if (StringUtils.equals(connectorStatus, pileStatus)) {
+			// 	return null;
+			// }
 			// 状态不一样，传给第三方平台
 			// 查询该站点是否推送第三方平台
 			ThirdPartyStationRelation relation = new ThirdPartyStationRelation();

jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java

@@ -208,7 +208,7 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
 		// close(channelId, pileSn);
 	}
 
-	private void close(ChannelId channelId, String pileSn) {
+	private void close(ChannelId channelId, String pileSn, ChannelHandlerContext ctx) {
 		log.error("close方法-发生异常，关闭链接，channelId:{}, pileSn:{}", channelId.asShortText(), pileSn);
 
 		// 删除桩编号和channel的关系

jsowell-ui/src/api/thirdParty/thirdPartyConfig.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询对接平台配置信息列表
+export function listThirdPartyConfig(query) {
+    return request({
+        url: '/thirdParty/thirdPartyConfig/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询对接平台配置信息详细
+export function getThirdPartyConfig(id) {
+    return request({
+        url: '/thirdParty/thirdPartyConfig/' + id,
+        method: 'get'
+    })
+}
+
+// 新增对接平台配置信息
+export function addThirdPartyConfig(data) {
+    return request({
+        url: '/thirdParty/thirdPartyConfig',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改对接平台配置信息
+export function updateThirdPartyConfig(data) {
+    return request({
+        url: '/thirdParty/thirdPartyConfig',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除对接平台配置信息
+export function delThirdPartyConfig(id) {
+    return request({
+        url: '/thirdParty/thirdPartyConfig/' + id,
+        method: 'delete'
+    })
+}

jsowell-ui/src/views/thirdParty/thirdPartyConfig/index.vue

@@ -0,0 +1,323 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="对接平台名称" prop="name">
+                <el-input
+                    v-model="queryParams.name"
+                    placeholder="请输入对接平台名称"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="运营商id" prop="operatorId">
+                <el-input
+                    v-model="queryParams.operatorId"
+                    placeholder="请输入运营商id"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="运营商密钥" prop="operatorSecret">
+                <el-input
+                    v-model="queryParams.operatorSecret"
+                    placeholder="请输入运营商密钥"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="签名密钥" prop="signSecret">
+                <el-input
+                    v-model="queryParams.signSecret"
+                    placeholder="请输入签名密钥"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="消息密钥" prop="dataSecret">
+                <el-input
+                    v-model="queryParams.dataSecret"
+                    placeholder="请输入消息密钥"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="消息密钥初始化向量" prop="dataSecretIv">
+                <el-input
+                    v-model="queryParams.dataSecretIv"
+                    placeholder="请输入消息密钥初始化向量"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    v-hasPermi="['thirdParty:thirdPartyConfig:add']"
+                >新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="success"
+                    plain
+                    icon="el-icon-edit"
+                    size="mini"
+                    :disabled="single"
+                    @click="handleUpdate"
+                    v-hasPermi="['thirdParty:thirdPartyConfig:edit']"
+                >修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="el-icon-delete"
+                    size="mini"
+                    :disabled="multiple"
+                    @click="handleDelete"
+                    v-hasPermi="['thirdParty:thirdPartyConfig:remove']"
+                >删除</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    v-hasPermi="['thirdParty:thirdPartyConfig:export']"
+                >导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="thirdPartyConfigList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="" align="center" prop="id" />
+            <el-table-column label="对接平台名称" align="center" prop="name" />
+            <el-table-column label="运营商id" align="center" prop="operatorId" />
+            <el-table-column label="运营商密钥" align="center" prop="operatorSecret" />
+            <el-table-column label="签名密钥" align="center" prop="signSecret" />
+            <el-table-column label="消息密钥" align="center" prop="dataSecret" />
+            <el-table-column label="消息密钥初始化向量" align="center" prop="dataSecretIv" />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        v-hasPermi="['thirdParty:thirdPartyConfig:edit']"
+                    >修改</el-button>
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)"
+                        v-hasPermi="['thirdParty:thirdPartyConfig:remove']"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
+
+        <!-- 添加或修改对接平台配置信息对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                <el-form-item label="对接平台名称" prop="name">
+                    <el-input v-model="form.name" placeholder="请输入对接平台名称" />
+                </el-form-item>
+                <el-form-item label="运营商id" prop="operatorId">
+                    <el-input v-model="form.operatorId" placeholder="请输入运营商id" />
+                </el-form-item>
+                <el-form-item label="运营商密钥" prop="operatorSecret">
+                    <el-input v-model="form.operatorSecret" placeholder="请输入运营商密钥" />
+                </el-form-item>
+                <el-form-item label="签名密钥" prop="signSecret">
+                    <el-input v-model="form.signSecret" placeholder="请输入签名密钥" />
+                </el-form-item>
+                <el-form-item label="消息密钥" prop="dataSecret">
+                    <el-input v-model="form.dataSecret" placeholder="请输入消息密钥" />
+                </el-form-item>
+                <el-form-item label="消息密钥初始化向量" prop="dataSecretIv">
+                    <el-input v-model="form.dataSecretIv" placeholder="请输入消息密钥初始化向量" />
+                </el-form-item>
+                <el-form-item label="删除标识" prop="delFlag">
+                    <el-input v-model="form.delFlag" placeholder="请输入删除标识" />
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { listThirdPartyConfig, getThirdPartyConfig, delThirdPartyConfig, addThirdPartyConfig, updateThirdPartyConfig } from "@/api/thirdParty/thirdPartyConfig";
+
+export default {
+    name: "ThirdPartyConfig",
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 对接平台配置信息表格数据
+            thirdPartyConfigList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                name: null,
+                operatorId: null,
+                operatorSecret: null,
+                signSecret: null,
+                dataSecret: null,
+                dataSecretIv: null,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+            }
+        };
+    },
+    created() {
+        this.getList();
+    },
+    methods: {
+        /** 查询对接平台配置信息列表 */
+        getList() {
+            this.loading = true;
+            listThirdPartyConfig(this.queryParams).then(response => {
+                this.thirdPartyConfigList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                id: null,
+                name: null,
+                operatorId: null,
+                operatorSecret: null,
+                signSecret: null,
+                dataSecret: null,
+                dataSecretIv: null,
+                createTime: null,
+                createBy: null,
+                updateTime: null,
+                updateBy: null,
+                delFlag: null
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length!==1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加对接平台配置信息";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const id = row.id || this.ids
+            getThirdPartyConfig(id).then(response => {
+                this.form = response.data;
+                this.open = true;
+                this.title = "修改对接平台配置信息";
+            });
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.id != null) {
+                        updateThirdPartyConfig(this.form).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addThirdPartyConfig(this.form).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除对接平台配置信息编号为"' + ids + '"的数据项？').then(function() {
+                return delThirdPartyConfig(ids);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download('thirdParty/thirdPartyConfig/export', {
+                ...this.queryParams
+            }, `thirdPartyConfig_${new Date().getTime()}.xlsx`)
+        }
+    }
+};
+</script>