From 16dfc0bd700f1ca940df3a298a252bb6c22e4192 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 08 四月 2024 15:18:36 +0800
Subject: [PATCH] 提交一把
---
server/platform/src/main/java/com/doumee/api/business/UnionApplyController.java | 141 +++++++++++++++++++++++
company/.env.productionCom | 10 +
server/platform/src/main/java/com/doumee/api/business/UnionChangeController.java | 138 +++++++++++++++++++++++
company/.env.developmentCom | 14 -
company/public/index.html | 4
company/.env.productionShop | 10 +
company/src/components/business/OperaUnionApplyCheckWindow.vue | 2
company/.env.developmentShop | 14 -
company/package.json | 5
company/src/views/login.vue | 2
company/.env.development | 12 -
11 files changed, 317 insertions(+), 35 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index a5a333a..1b1927b 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -2,17 +2,11 @@
NODE_ENV = 'development'
# 鎺ュ彛鍓嶇紑
-# VUE_APP_API_PREFIX = '/yyb_web_api'
+# VUE_APP_API_PREFIX = '/yyb_admin_api'
-# 浼佷笟绔�-浠佸悍
-#VUE_APP_API = 'http://192.168.0.153:10031/'
-# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
-# 骞冲彴绔�-浠佸悍
-# VUE_APP_API = 'http://192.168.0.186:10030/'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-# 骞冲彴绔�-钀嶅
-# VUE_APP_API = 'http://192.168.0.105:10023/'
+ VUE_APP_API = 'http://192.168.0.190:10030/'
-VUE_APP_API = 'http://localhost:10030/'
+#VUE_APP_API = 'http://localhost:10030/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 9ea5a62..0c2415e 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -2,17 +2,11 @@
NODE_ENV = 'development'
# 鎺ュ彛鍓嶇紑
-# VUE_APP_API_PREFIX = '/yyb_web_api'
+# VUE_APP_API_PREFIX = '/yyb_admin_api'
-# 浼佷笟绔�-浠佸悍
-# VUE_APP_API = 'http://192.168.0.186:10031/'
-# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
-# 骞冲彴绔�-浠佸悍
-# VUE_APP_API = 'http://192.168.0.186:10030/'
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-# 骞冲彴绔�-钀嶅
-# VUE_APP_API = 'http://192.168.0.105:10023/'
+ VUE_APP_API = 'http://192.168.0.190:10031/'
-VUE_APP_API = 'http://localhost:10031/'
+#VUE_APP_API = 'http://localhost:10030/'
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index fd0d4ea..b55a1b8 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -2,17 +2,11 @@
NODE_ENV = 'development'
# 鎺ュ彛鍓嶇紑
-# VUE_APP_API_PREFIX = '/yyb_web_api'
+# VUE_APP_API_PREFIX = '/yyb_admin_api'
-# 浼佷笟绔�-浠佸悍
-# VUE_APP_API = 'http://192.168.0.186:10031/'
-# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
-# 骞冲彴绔�-浠佸悍
-# VUE_APP_API = 'http://192.168.0.186:10030/'
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-# 骞冲彴绔�-钀嶅
-# VUE_APP_API = 'http://192.168.0.105:10023/'
+ VUE_APP_API = 'http://192.168.0.190:10032/'
-VUE_APP_API = 'http://localhost:10032/'
+#VUE_APP_API = 'http://localhost:10030/'
diff --git a/company/.env.productionCom b/company/.env.productionCom
new file mode 100644
index 0000000..9cf23b3
--- /dev/null
+++ b/company/.env.productionCom
@@ -0,0 +1,10 @@
+# 鐢熶骇鐜閰嶇疆
+NODE_ENV = 'production'
+
+VUE_APP_API_PREFIX = '/yyb_admin_api'
+
+# 骞冲彴绔�
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+
+# 浼佷笟绔�
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
diff --git a/company/.env.productionShop b/company/.env.productionShop
new file mode 100644
index 0000000..9cf23b3
--- /dev/null
+++ b/company/.env.productionShop
@@ -0,0 +1,10 @@
+# 鐢熶骇鐜閰嶇疆
+NODE_ENV = 'production'
+
+VUE_APP_API_PREFIX = '/yyb_admin_api'
+
+# 骞冲彴绔�
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+
+# 浼佷笟绔�
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
diff --git a/company/package.json b/company/package.json
index d631b5d..0e80519 100644
--- a/company/package.json
+++ b/company/package.json
@@ -1,5 +1,5 @@
{
- "name": "intelligent_manufacture",
+ "name": "yunyibao",
"version": "1.0.0",
"private": true,
"scripts": {
@@ -7,7 +7,8 @@
"serveshop": "vue-cli-service serve --mode developmentShop",
"servecom": "vue-cli-service serve --mode developmentCom",
"build:pro": "vue-cli-service build",
- "build:pro_v2": "vue-cli-service build --mode production_v2",
+ "build:proCom": "vue-cli-service build --mode productionCom",
+ "build:proShop": "vue-cli-service build --mode productionShop",
"build:dev": "vue-cli-service build --mode staging",
"lint": "vue-cli-service lint",
"fix": "eslint --ext .js,.vue src --fix"
diff --git a/company/public/index.html b/company/public/index.html
index 8314eac..3dc2fcc 100644
--- a/company/public/index.html
+++ b/company/public/index.html
@@ -5,11 +5,11 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>bitbug_favicon.ico">
- <title>浜戞槗淇�</title>
+ <title>浜戞槗淇濆鎴锋湇鍔＄郴缁�</title>
</head>
<body>
<noscript>
- <strong>We're sorry but 浜戞槗淇� doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+ <strong>We're sorry but yyb-customer-serve-system doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
diff --git a/company/src/components/business/OperaUnionApplyCheckWindow.vue b/company/src/components/business/OperaUnionApplyCheckWindow.vue
index 457e5b6..9730d0f 100644
--- a/company/src/components/business/OperaUnionApplyCheckWindow.vue
+++ b/company/src/components/business/OperaUnionApplyCheckWindow.vue
@@ -73,7 +73,7 @@
</el-form-item>
</div>
<div class="box_table_content_item"> <el-input style="width: 60%" v-model="form.bxdMultifileList[index].serverMoney" placeholder="璇疯緭鍏�" ></el-input>
- <span style="margin-left: 15px">鍏�/澶�/浜�</span></div>
+ <span style="margin-left: 15px">鍏�/浜�</span></div>
</div>
</div>
<!-- <div v-for="(item,index) in this.model.applyList" :key="index">
diff --git a/company/src/views/login.vue b/company/src/views/login.vue
index 90ed866..1ea5e75 100644
--- a/company/src/views/login.vue
+++ b/company/src/views/login.vue
@@ -1,7 +1,7 @@
<template>
<div class="wrap">
<div class="introduce">
- <h2>浜戞槗淇�</h2>
+ <h2>浜戞槗淇濆鎴锋湇鍔＄郴缁�</h2>
</div>
<div class="login">
<h1>绯荤粺鐧诲綍 / LOGIN IN</h1>
diff --git a/server/platform/src/main/java/com/doumee/api/business/UnionApplyController.java b/server/platform/src/main/java/com/doumee/api/business/UnionApplyController.java
new file mode 100644
index 0000000..9878c66
--- /dev/null
+++ b/server/platform/src/main/java/com/doumee/api/business/UnionApplyController.java
@@ -0,0 +1,141 @@
+package com.doumee.api.business;
+
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.*;
+import com.doumee.dao.business.model.UnionApply;
+import com.doumee.service.business.UnionApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/03/12 11:34
+ */
+@Api(tags = "鍚堝苟鎶曚繚鍗曚俊鎭〃")
+@RestController
+@RequestMapping("/business/unionApply")
+public class UnionApplyController extends BaseController {
+
+ @Autowired
+ private UnionApplyService unionApplyService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:unionapply:create")
+ public ApiResponse create(@RequestBody UnionApply unionApply) {
+ return ApiResponse.success(unionApplyService.create(unionApply));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:unionapply:delete")
+ public ApiResponse deleteById(@PathVariable Integer id) {
+ unionApplyService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:unionapply:delete")
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray) {
+ idList.add(Integer.valueOf(id));
+ }
+ unionApplyService.deleteByIdInBatch(idList);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:unionapply:update")
+ public ApiResponse updateById(@RequestBody UnionApply unionApply) {
+ unionApplyService.updateById(unionApply);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:unionapply:query")
+ public ApiResponse<PageData<UnionApply>> findPage (@RequestBody PageWrap<UnionApply> pageWrap) {
+ return ApiResponse.success(unionApplyService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:unionapply:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<UnionApply> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(UnionApply.class).export(unionApplyService.findPage(pageWrap).getRecords(), "鍚堝苟鎶曚繚鍗曚俊鎭〃", response);
+ }
+ @ApiOperation("瀵煎嚭鎶曚繚璇︽儏鍗�")
+ @PostMapping("/exportDetailExcel")
+ @RequiresPermissions("business:unionapply:exportExcel")
+ public void exportDetailExcel (@RequestBody UnionApply model, HttpServletResponse response) {
+ ExcelExporter.build(UnionApply.class).exportUnionApplyDetail(unionApplyService.findDetailForExport(model), response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:unionapply:query")
+ public ApiResponse<UnionApply> findById(@PathVariable Integer id) {
+ return ApiResponse.success(unionApplyService.detail(id));
+ }
+
+
+ @PreventRepeat
+ @ApiOperation("鍒涘缓鍚堝苟鍗�")
+ @PostMapping("/merge")
+ @RequiresPermissions("business:unionapply:create")
+ public ApiResponse merge(@RequestBody SaveUnionApplyDTO saveUnionApplyDTO) {
+ return ApiResponse.success(unionApplyService.merge(saveUnionApplyDTO));
+ }
+
+ @ApiOperation("閫�鍥炲悎骞跺崟")
+ @PostMapping("/cancel")
+ @RequiresPermissions("business:unionapply:cancel")
+ public ApiResponse close(@RequestBody CloseDTO closeDTO) {
+ unionApplyService.cancelMerge(closeDTO);
+ return ApiResponse.success(null);
+ }
+
+ @PreventRepeat
+ @ApiOperation("涓婁紶鎶曚繚鍗�")
+ @PostMapping("/uploadToubaodan")
+ @RequiresPermissions("business:unionapply:uploadToubaodan")
+ public ApiResponse uploadToubaodan(@RequestBody UploadMultifileDTO uploadMultifileDTO) {
+ unionApplyService.uploadToubaodan(uploadMultifileDTO);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("绛剧讲鐢宠鍗�")
+ @PostMapping("/getSignLink")
+ @RequiresPermissions("business:unionapply:query")
+ public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
+ return ApiResponse.success( unionApplyService.getSignLink(smsCheckDTO));
+ }
+
+
+ @ApiOperation("涓婁紶淇濋櫓鍗�")
+ @PostMapping("/uploadBXD")
+ @RequiresPermissions("business:unionapply:uploadBXD")
+ public ApiResponse uploadBXD(@RequestBody UnionApplyBXDDTO unionApplyBXDDTO) {
+ unionApplyService.uploadBXD(unionApplyBXDDTO);
+ return ApiResponse.success(null);
+ }
+
+
+}
diff --git a/server/platform/src/main/java/com/doumee/api/business/UnionChangeController.java b/server/platform/src/main/java/com/doumee/api/business/UnionChangeController.java
new file mode 100644
index 0000000..a473c24
--- /dev/null
+++ b/server/platform/src/main/java/com/doumee/api/business/UnionChangeController.java
@@ -0,0 +1,138 @@
+package com.doumee.api.business;
+
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.CloseDTO;
+import com.doumee.dao.business.dto.SaveUnionChangeDTO;
+import com.doumee.dao.business.dto.SmsCheckDTO;
+import com.doumee.dao.business.dto.UnionChangeBXDDTO;
+import com.doumee.dao.business.model.UnionChange;
+import com.doumee.service.business.UnionChangeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/03/12 11:34
+ */
+@Api(tags = "鍔犲噺淇濇崲鍘傚悎骞跺崟淇℃伅琛�")
+@RestController
+@RequestMapping("/business/unionChange")
+public class UnionChangeController extends BaseController {
+
+ @Autowired
+ private UnionChangeService unionChangeService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:unionchange:create")
+ public ApiResponse create(@RequestBody UnionChange unionChange) {
+ return ApiResponse.success(unionChangeService.create(unionChange));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:unionchange:delete")
+ public ApiResponse deleteById(@PathVariable Integer id) {
+ unionChangeService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:unionchange:delete")
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray) {
+ idList.add(Integer.valueOf(id));
+ }
+ unionChangeService.deleteByIdInBatch(idList);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:unionchange:update")
+ public ApiResponse updateById(@RequestBody UnionChange unionChange) {
+ unionChangeService.updateById(unionChange);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:unionchange:query")
+ public ApiResponse<PageData<UnionChange>> findPage (@RequestBody PageWrap<UnionChange> pageWrap) {
+ return ApiResponse.success(unionChangeService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:unionchange:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<UnionChange> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(UnionChange.class).export(unionChangeService.findPage(pageWrap).getRecords(), "鍔犲噺淇濇崲鍘傚悎骞跺崟淇℃伅琛�", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:unionchange:query")
+ public ApiResponse findById(@PathVariable Integer id) {
+ return ApiResponse.success(unionChangeService.getDetail(id));
+ }
+
+ @PreventRepeat
+ @ApiOperation("鍒涘缓鍚堝苟鍗�")
+ @PostMapping("/merge")
+ @RequiresPermissions("business:unionchange:create")
+ public ApiResponse merge(@RequestBody SaveUnionChangeDTO saveUnionChangeDTO) {
+ return ApiResponse.success(unionChangeService.merge(saveUnionChangeDTO));
+ }
+
+
+ @ApiOperation("鍏抽棴鍚堝苟鍗�")
+ @PostMapping("/close")
+ @RequiresPermissions("business:unionchange:close")
+ public ApiResponse close(@RequestBody CloseDTO closeDTO) {
+ unionChangeService.cancelMerge(closeDTO);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation("绛剧讲鐢宠鍗�")
+ @PostMapping("/getSignLink")
+ @RequiresPermissions("business:unionchange:sign")
+ public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
+ return ApiResponse.success(unionChangeService.getSignLink(smsCheckDTO));
+ }
+
+ @ApiOperation("涓婁紶淇濋櫓鍗�")
+ @PostMapping("/uploadBXD")
+ @RequiresPermissions("business:unionchange:uploadBXD")
+ public ApiResponse uploadBXD(@RequestBody UnionChangeBXDDTO unionChangeBXDDTO) {
+ unionChangeService.uploadBXD(unionChangeBXDDTO);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation("瀵煎嚭鎶曚繚璇︽儏鍗�")
+ @PostMapping("/exportDetailExcel")
+ @RequiresPermissions("business:unionchange:exportExcel")
+ public void exportDetailExcel (@RequestBody UnionChange model, HttpServletResponse response) {
+ ExcelExporter.build(UnionChange.class).exportUnionChangeDetail(unionChangeService.unionChangeDetail(model.getId()), response);
+ }
+
+
+
+}
--
Gitblit v1.9.3