From d8abf759fc873b204cfdc3f7c5f7eba11143763b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 12 十一月 2024 10:52:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java | 11 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java | 2
server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java | 98 +++++++++++++++-
server/DBbackup.sh | 6 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java | 34 +++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 43 +++---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 32 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 15 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 89 +++++++++-----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java | 10
14 files changed, 261 insertions(+), 87 deletions(-)
diff --git a/server/DBbackup.sh b/server/DBbackup.sh
new file mode 100644
index 0000000..1ba1cc8
--- /dev/null
+++ b/server/DBbackup.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+/usr/local/mysql/bin/mysqldump -h127.0.0.1 -uroot -pAtwl@2024 antaiwuliu > /usr/local/jars/dbbackup/antaiwuliu_$(date +%Y%m%d).sql
+
+# 鍒犻櫎7澶╁墠鐨勫浠芥暟鎹�
+find /usr/local/jars/dbbackup -name "antaiwuliu_*.sql" -type f -mtime +7 -exec rm {} \; > /dev/null 2>&1
+
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 6619215..3c04472 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -137,6 +137,8 @@
public static final String TMS_ORDER_DETAIL_URL ="TMS_ORDER_DETAIL_URL" ;
public static final String TMS_LOCK_STATUS_URL ="TMS_LOCK_STATUS_URL" ;
public static final String TMS_INTERFACE_URL_PREFIX ="TMS_INTERFACE_URL_PREFIX" ;
+ public static final String MYSQL_BACKUP_CDOE ="MYSQL_BACKUP_CDOE" ;
+ public static final String MYSQL_BACKUP_DIR ="MYSQL_BACKUP_DIR" ;
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
public static boolean DEALING_HK_SYNCPLATFORM = false;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
index 8ee19de..eeb60bf 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
@@ -1,6 +1,8 @@
package com.doumee.api;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Date;
import com.doumee.core.utils.DateUtil;
import com.doumee.service.business.PlatformJobService;
@@ -12,11 +14,15 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.io.BufferedReader;
import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* @author 姹熻箘韫�
@@ -30,6 +36,8 @@
@Autowired
private PlatformJobService platformJobService;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@ApiOperation("鏁版嵁搴撳浠斤紝淇濈暀鏈�杩�7涓浠絪ql")
@@ -37,11 +45,26 @@
public ApiResponse backupDatabase() {
try {
String timestamp = DateUtil.getNowLongTime();
- String path = "/usr/local/jars/db/";
+// String path = "/usr/local/jars/db/";
+// String backupPath = path + timestamp + ".sql";
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MYSQL_BACKUP_DIR).getCode();
+ String code = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MYSQL_BACKUP_CDOE).getCode() ;
String backupPath = path + timestamp + ".sql";
- // 浣跨敤mysqldump鍛戒护杩涜鏁版嵁搴撳浠�
- Process process = Runtime.getRuntime().exec(new String[]{"mysqldump ", "-u", "root", "-p","Atwl@2024", "antaiwuliu", "-r", backupPath});
- process.waitFor();
+ code= code.replace("${param}",backupPath);
+ log.error("鏁版嵁搴撳浠�================: " + code);
+ ProcessBuilder builder = new ProcessBuilder(code);
+ // 閲嶅畾鍚戦敊璇祦鍒版爣鍑嗚緭鍑烘祦
+ builder.redirectErrorStream(true);
+ // stdout
+ Process process = builder.start();
+ new Thread(new ProcessHandleRunnable(process)).start();
+ process.waitFor(); // wait if needed
+
+ /* // 浣跨敤mysqldump鍛戒护杩涜鏁版嵁搴撳浠�
+ Process process = Runtime.getRuntime().exec(code);
+ process.getErrorStream();
+ process.getInputStream();
+ process.waitFor();*/
// 妫�鏌ュ浠芥槸鍚︽垚鍔�
if (new File(backupPath).exists()) {
@@ -53,11 +76,70 @@
deleteOldFiles(path,7);//淇濈暀鏈�杩�7涓枃浠�
} catch (Exception e) {
e.printStackTrace();
+
log.error("鏁版嵁搴撳浠藉け璐�."+e.getMessage());
}
return ApiResponse.failed("鏁版嵁搴撳浠藉け璐�" );
}
+ public void run() {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String currentDateTime = dateFormat.format(new Date());
+ String fileName = "backup_" + currentDateTime + ".sql";
+ try {
+ Class.forName("com.mysql.cj.jdbc.Driver");
+ Connection connection = DriverManager.getConnection("localhost:3306/antaiwuliu", "root", "Atwl@2024");
+ Statement statement = connection.createStatement();
+
+ String query = "SELECT * INTO OUTFILE '" + fileName + "' FROM your_table";
+ statement.execute(query);
+
+ System.out.println("Database backup successful to " + fileName);
+
+ statement.close();
+ connection.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String[] args) {
+ new DatabaseController().run();;
+ }
+
+ static class ProcessHandleRunnable implements Runnable {
+ private Process process;
+
+ public ProcessHandleRunnable(Process process) {
+ this.process = process;
+ }
+
+ public void run() {
+ BufferedReader br = null;
+ InputStreamReader reader = null;
+ try {
+ System.out.println("start run...");
+ reader = new InputStreamReader(process.getInputStream());
+ br = new BufferedReader(reader);
+ String line = null;
+ while ((line = br.readLine()) != null) {
+ System.out.println(line);
+ }
+ System.out.println("stop run...");
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ } finally {
+ try {
+ if (br != null)
+ br.close();
+ if (reader != null)
+ reader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
/**
* @param path
*/
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java
index ce95704..24adbd2 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java
@@ -8,7 +8,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Cars;
import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.model.Company;
import com.doumee.service.business.CategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -88,6 +90,13 @@
public void exportExcel (@RequestBody PageWrap<Category> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
ExcelExporter.build(Category.class).export(categoryService.findPage(pageWrap).getRecords(), "鍒嗙被淇℃伅琛�", response);
}
+ @ApiOperation("瀵煎嚭浜岀骇鍒嗙被鏁版嵁Excel")
+ @PostMapping("/exportChildExcel")
+ @CloudRequiredPermission("business:category:exportExcel")
+ public void exportChildExcel (@RequestBody PageWrap<Category> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+// pageWrap.getModel().setType(Constants.ONE);
+ ExcelExporter.build(Category.class).export(categoryService.findChileList(pageWrap.getModel()), "杞﹁締鍒嗙被淇℃伅琛�", response);
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@@ -106,4 +115,6 @@
category.setType(type);
return ApiResponse.success(categoryService.findList(category));
}
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 8ff499e..f5c3197 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -137,7 +137,7 @@
String[] findDeviceAlarmPage= new String[]{"/api/v1/alarm/findDeviceAlarmPage","鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰�"};//鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰�
String[] getTodoListPage= new String[]{"/api/v3/todo/getTodoListPage","鍒嗛〉鑾峰彇寰呭姙鍒楄〃"};//1.10.1鍒嗛〉鑾峰彇寰呭姙鍒楄〃
String[] loginOut= new String[]{"/xauthplus-plugin/logout","閫�鍑虹櫥褰�"};//閫�鍑虹櫥褰�
- String[] sendSms= new String[]{"/api/smsps/v1/smsService/sms","鐭俊楠岃瘉鐮�"};//鐭俊楠岃瘉鐮�
+ String[] sendSms= new String[]{"/api/v1/smsService/sms","鐭俊楠岃瘉鐮�"};//鐭俊楠岃瘉鐮�
String[] getMenus= new String[]{"/api/privilegeService/v1/menus/list","鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鑿滃崟鍔熻兘椤�"};//鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鑿滃崟鍔熻兘椤�
String[] rootRegion= new String[]{"/api/resource/v1/regions/root","鑾峰彇鏍瑰尯鍩熶俊鎭帴鍙�"};//鑾峰彇鏍瑰尯鍩熶俊鎭帴鍙�
String[] subRegions= new String[]{"/api/resource/v1/regions/subRegions","鏍规嵁鍖哄煙缂栧彿鑾峰彇涓嬩竴绾у尯鍩熷垪琛�"};//鏍规嵁鍖哄煙缂栧彿鑾峰彇涓嬩竴绾у尯鍩熷垪琛�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
index 99b3c22..8147e45 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
@@ -25,135 +25,150 @@
@TableId(value = "id",type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
+// @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ //@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ //@ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
+ //@ExcelColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@ApiModelProperty(value = "鎺堟潈寮�濮嬫椂闂�")
- @ExcelColumn(name="鎺堟潈寮�濮嬫椂闂�")
+ //@ExcelColumn(name="鎺堟潈寮�濮嬫椂闂�")
+ @ExcelColumn(name="寮�濮嬫椂闂�" ,index = 10,width = 12)
private Date startTime;
@ApiModelProperty(value = "鎺堟潈缁撴潫鏃堕棿")
- @ExcelColumn(name="鎺堟潈缁撴潫鏃堕棿")
+ //@ExcelColumn(name="鎺堟潈缁撴潫鏃堕棿")
+ @ExcelColumn(name="缁撴潫鏃堕棿" ,index = 11,width = 12)
private Date endTime;
@ApiModelProperty(value = "鏈�鍚庝竴娆¤繘鍘傛椂闂�")
- @ExcelColumn(name="鏈�鍚庝竴娆¤繘鍘傛椂闂�")
+ //@ExcelColumn(name="鏈�鍚庝竴娆¤繘鍘傛椂闂�")
private Date lastInDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ //@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "鎺堟潈鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�", example = "1")
- @ExcelColumn(name="鎺堟潈鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�")
+ //@ExcelColumn(name="鎺堟潈鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�")
private Integer authTimeType;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ //@ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "棰勭害鏍囪瘑", example = "1")
- @ExcelColumn(name="棰勭害鏍囪瘑")
+ //@ExcelColumn(name="棰勭害鏍囪瘑")
private String hkId;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelColumn(name="鎺掑簭鐮�")
+ //@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name="杞︾墝鍙�")
+ @ExcelColumn(name="杞︾墝鍙�" ,index = 1,width = 8)
private String code;
@ApiModelProperty(value = "鎺堟潈鍋滆溅缂栫爜闆嗗悎锛堝叧鑱攑arks)", example = "1")
- @ExcelColumn(name="鎺堟潈鍋滆溅缂栫爜闆嗗悎锛堝叧鑱攑arks)")
+ //@ExcelColumn(name="鎺堟潈鍋滆溅缂栫爜闆嗗悎锛堝叧鑱攑arks)")
private String parkId;
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ //@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
+ //@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
private Date hkDate;
@ApiModelProperty(value = "褰掑睘浜虹紪鐮�", example = "1")
- @ExcelColumn(name="褰掑睘浜虹紪鐮�")
+ //@ExcelColumn(name="褰掑睘浜虹紪鐮�")
private Integer memberId;
@ApiModelProperty(value = "褰掑睘浜篍RP缂栫爜")
- @ExcelColumn(name="褰掑睘浜篍RP缂栫爜")
+ //@ExcelColumn(name="褰掑睘浜篍RP缂栫爜")
private String memberUserId;
@ApiModelProperty(value = "鍏宠仈EPR鏍囪瘑")
- @ExcelColumn(name="鍏宠仈EPR鏍囪瘑")
+ //@ExcelColumn(name="鍏宠仈EPR鏍囪瘑")
private String erpId;
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
- @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
+ //@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
@ApiModelProperty(value = "鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯", example = "1")
- @ExcelColumn(name="鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯")
+ //@ExcelColumn(name="鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯")
private Integer inStatus;
@ApiModelProperty(value = "鎺堟潈鐘舵�� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鎺堟潈鐘舵�� 0鍚� 1鏄�")
+ //@ExcelColumn(name="鎺堟潈鐘舵�� 0鍚� 1鏄�")
private Integer authStatus;
@ApiModelProperty(value = "鎵�灞炵粍缁囦富閿紙鍏宠仈company)", example = "1")
- @ExcelColumn(name="鎵�灞炵粍缁囦富閿紙鍏宠仈company)")
+ //@ExcelColumn(name="鎵�灞炵粍缁囦富閿紙鍏宠仈company)")
private Integer groupId;
@ApiModelProperty(value = "绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠", example = "1")
- @ExcelColumn(name="绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠")
+ @ExcelColumn(name="澶囨敞" ,index = 2,width = 8,valueMapping ="0=瀹夋嘲鍏姟杞�;1=瀹夋嘲鑷湁鐗╂祦杞�;2=鍏朵粬" )
private Integer type;
@ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮�", example = "1")
- @ExcelColumn(name="鎵�灞炲垎绫荤紪鐮�")
+ //@ExcelColumn(name="鎵�灞炲垎绫荤紪鐮�")
private Integer cateId;
@ApiModelProperty(value = "鍋滆溅鍦哄悕绉伴泦鍚�", example = "1")
- @ExcelColumn(name="鍋滆溅鍦哄悕绉伴泦鍚�")
+ //@ExcelColumn(name="鍋滆溅鍦哄悕绉伴泦鍚�")
@TableField(exist = false)
+ @ExcelColumn(name="鍋滆溅鍦哄悕绉伴泦鍚�" ,index = 9,width = 10)
private String parksName;
@ApiModelProperty(value = "缂栬緫浜哄鍚�", example = "1")
- @ExcelColumn(name="缂栬緫浜哄鍚�")
+ //@ExcelColumn(name="缂栬緫浜哄鍚�")
@TableField(exist = false)
private String editorName;
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
- @ExcelColumn(name="鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ //@ExcelColumn(name="鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
@TableField(exist = false)
private Integer memberType;
@ApiModelProperty(value = "濮撳悕", example = "1")
- @ExcelColumn(name="濮撳悕")
+ //@ExcelColumn(name="濮撳悕")
@TableField(exist = false)
+ @ExcelColumn(name="杞︿富" ,index = 5,width = 8)
private String memberName;
@ApiModelProperty(value = "杞︿富娴峰悍缂栫爜", example = "1")
@TableField(exist = false)
private String memberHkId;
@ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
- @ExcelColumn(name="鎵嬫満鍙�")
+ //@ExcelColumn(name="鎵嬫満鍙�")
@TableField(exist = false)
+ @ExcelColumn(name="鎵嬫満鍙�" ,index = 6,width = 8)
private String memberPhone;
+ @ApiModelProperty(value = "鎬у埆", example = "1")
+ //@ExcelColumn(name="鎵嬫満鍙�")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎬у埆" ,index = 7,width = 5,valueMapping = "0=鏈煡;1=鐢�;2=濂�")
+ private Integer memberSex;
+ @ApiModelProperty(value = "韬唤璇佸彿", example = "1")
+ //@ExcelColumn(name="鎵嬫満鍙�")
+ @TableField(exist = false)
+ @ExcelColumn(name="韬唤璇佸彿" ,index = 8,width = 10)
+ private String memberCard;
@ApiModelProperty(value = "閮ㄩ棬", example = "1")
- @ExcelColumn(name="閮ㄩ棬")
+ //@ExcelColumn(name="閮ㄩ棬")
@TableField(exist = false)
private String companyName;
@ApiModelProperty(value = "杞︿富鏄惁鍒犻櫎", example = "1")
@@ -180,6 +195,11 @@
@TableField(exist = false)
private String cateName;
+ @ApiModelProperty(value = "鎵�灞炲垎绫�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎵�灞炲垎绫�" ,index = 3,width = 10)
+ private String groupCateName;
+
@ApiModelProperty(value = "涓�绾у垎绫诲悕绉�", example = "1")
@TableField(exist = false)
private String catePName;
@@ -188,13 +208,14 @@
private int isnew;
@ApiModelProperty(value = "杞﹁締閮ㄩ棬鍚嶇О", example = "1")
- @ExcelColumn(name="杞﹁締缁勭粐閮ㄩ棬鍚嶇О")
+ //@ExcelColumn(name="杞﹁締缁勭粐閮ㄩ棬鍚嶇О")
@TableField(exist = false)
private String carCompanyName;
@ApiModelProperty(value = "杞﹁締閮ㄩ棬鍏ㄨ矾寰勫悕绉�", example = "1")
- @ExcelColumn(name="杞﹁締閮ㄩ棬鍏ㄨ矾寰勫悕绉�")
+ //@ExcelColumn(name="杞﹁締閮ㄩ棬鍏ㄨ矾寰勫悕绉�")
@TableField(exist = false)
+ @ExcelColumn(name="鎵�灞炵粍缁�" ,index = 4,width = 15)
private String carCompanyNamePath;
@ApiModelProperty(value = "杞︿富瀵硅薄", example = "1")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
index b2f5efa..81cdb04 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -25,56 +25,64 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭")
- @ExcelColumn(name="涓婚敭")
+ //@ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ //@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ //@ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
+ //@ExcelColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ //@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "鍚嶇О")
- @ExcelColumn(name="鍚嶇О")
+ @ExcelColumn(name="浜岀骇鍒嗙被鍚嶇О",index = 2,width = 12)
private String name;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ //@ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
- @ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
+ //@ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�")
- @ExcelColumn(name="鎺掑簭鐮�")
+ //@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "鍥炬爣")
- @ExcelColumn(name="鍥炬爣")
+ //@ExcelColumn(name="鍥炬爣")
private String imgurl;
@ApiModelProperty(value = "绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
- @ExcelColumn(name="绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
+ //@ExcelColumn(name="绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
private Integer type;
@ApiModelProperty(value = "鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
- @ExcelColumn(name="鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
+ //@ExcelColumn(name="鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
private Integer parentId;
+ @ApiModelProperty(value = "鐖剁骇鍚嶇О ")
+ @TableField(exist = false)
+ @ExcelColumn(name="涓�绾у垎绫诲悕绉�",index = 1,width = 12)
+ private String parentName;
+ @ApiModelProperty(value = "缁勫悎鍚嶇О ")
+ @TableField(exist = false)
+ @ExcelColumn(name="缁勫悎鍚嶇О",index = 3,width = 20)
+ private String groupName;
@ApiModelProperty(value = "瀛愰泦鍒嗙被")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java
index 08a61f8..2383cf2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CategoryService.java
@@ -101,4 +101,6 @@
* @return long
*/
long count(Category category);
+
+ List<Category> findChileList(Category model);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index a08b6e5..fd24758 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -370,6 +370,8 @@
queryWrapper.selectAs(Member::getName,Cars::getMemberName);
queryWrapper.selectAs(SystemUser::getRealname,Cars::getEditorName);
queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
+ queryWrapper.selectAs(Member::getSex,Cars::getMemberSex);
+ queryWrapper.selectAs(Member::getIdcardDecode,Cars::getMemberCard);
queryWrapper.selectAs(Company::getCompanyNamePath,Cars::getCompanyName);
queryWrapper.selectAs(Category::getParentId,Cars::getCatePId);
queryWrapper.selectAs(Category::getName,Cars::getCateName);
@@ -386,6 +388,7 @@
.or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getCompanyNamePath,pageWrap.getModel().getCompanyName());
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType());
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCateId()),Category::getId,pageWrap.getModel().getCateId());
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCatePId()),Category::getParentId,pageWrap.getModel().getCatePId());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Cars::getCode,pageWrap.getModel().getCode());
queryWrapper.eq(Cars::getIsdeleted,Constants.ZERO);
@@ -417,22 +420,28 @@
.in(ParkBook::getCarCode,codes)
.eq(ParkBook::getIsdeleted,Constants.ZERO) );
for(Cars cars :result.getRecords()){
- cars.setParkBookList(getParkbookListByCode(cars.getCode(),parkBooks));
+ if(StringUtils.isNotBlank(cars.getCateName())){
+ cars.setGroupCateName(StringUtils.defaultString(cars.getCatePName(),"") + "/" + StringUtils.defaultString(cars.getCateName(),""));
+ }
+ cars.setParkBookList(getParkbookListByCode(cars,parkBooks));
}
}
return PageData.from(result);
}
- private List<ParkBook> getParkbookListByCode(String code, List<ParkBook> parkBooks) {
+ private List<ParkBook> getParkbookListByCode(Cars car, List<ParkBook> parkBooks) {
List<ParkBook> list =null;
+ String name = "";
for(ParkBook p : parkBooks){
- if(StringUtils.equals(p.getCarCode(),code)){
+ if(StringUtils.equals(p.getCarCode(),car.getCode())){
if(list == null){
list = new ArrayList<>();
}
+ name += p.getParksName();
list.add(p);
}
}
+ car.setParksName(name);
return list;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 8eaa6f8..6de45a4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -14,11 +14,13 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -155,6 +157,36 @@
QueryWrapper<Category> wrapper = new QueryWrapper<>(category);
return categoryMapper.selectCount(wrapper);
}
+ @Override
+ public List<Category> findChileList(Category model) {
+ List<Category> list =findList(model);
+ List<Category> data = new ArrayList<>();
+ if(list!=null){
+ for(Category category : list){
+ if(category.getParentId()!=null){
+ Category pcate = getParentById(category.getParentId(),list);
+ if(pcate!=null){
+ category.setParentName(StringUtils.defaultString(pcate.getName(),""));
+ category.setName(StringUtils.defaultString(category.getName(),""));
+ category.setGroupName( category.getParentName()+"/"+category.getName());
+ data.add(category);
+ }
+ }
+ }
+ }
+ return data;
+ }
+
+ private Category getParentById(Integer parentId, List<Category> list) {
+ if(list!=null){
+ for(Category category : list){
+ if(Constants.equalsInteger(parentId,category.getId())){
+ return category;
+ }
+ }
+ }
+ return null;
+ }
private void checkUnique(Category category){
QueryWrapper<Category> wrapper = new QueryWrapper<>();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
index ac79a06..ce9947d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
@@ -247,11 +247,11 @@
MPJLambdaWrapper<ParkBook> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(ParkBook.class);
- queryWrapper.selectAs(Parks::getName,Cars::getParksName);
- queryWrapper.selectAs(Member::getType,Cars::getMemberType);
- queryWrapper.selectAs(Member::getName,Cars::getMemberName);
- queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
- queryWrapper.selectAs(Company::getName,Cars::getCompanyName);
+ queryWrapper.selectAs(Parks::getName,ParkBook::getParksName);
+ queryWrapper.selectAs(Member::getType,ParkBook::getMemberType);
+ queryWrapper.selectAs(Member::getName,ParkBook::getMemberName);
+ queryWrapper.selectAs(Member::getPhone,ParkBook::getMemberPhone);
+ queryWrapper.selectAs(Company::getName,ParkBook::getCompanyName);
queryWrapper.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
queryWrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index c453c2c..090d3b6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -46,6 +46,8 @@
@Autowired
@Lazy
private EmayService emayService;
+ @Autowired
+ private SmsConfigMapper smsConfigMapper;
@Value("${debug_model}")
private boolean debugModel;
@@ -96,28 +98,27 @@
)>=3){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝瓒呭嚭鍙戦�佹鏁帮紝璇风◢鍚庨噸璇曪紒");
}
-
String code = Constants.getRandom6Num();
-
- String content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode()+"楠岃瘉鐮佷负锛�"+code+"锛屾楠岃瘉鐮佹湁鏁堜负3鍒嗛挓銆傝鍕挎硠闇�";
-
-// boolean result= emayService.sendSingleSms(smsEmail.getPhone(),content);
- emayService.sendSmsByHk(smsEmail.getPhone(),content);
-// if(!result){
-// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐭俊楠岃瘉鐮佸彂閫佸け璐ワ紝璇风◢鍚庨噸璇曪紒");
-// }
-
- smsEmail.setRemark(code);
- smsEmail.setIsdeleted(Constants.ZERO);
- smsEmail.setCreateDate(new Date());
- smsEmail.setStatus(Constants.ZERO);
- smsEmail.setType(Constants.ZERO);
- smsEmail.setTitle("鐭俊楠岃瘉鐮�");
- smsEmail.setContent(content);
- smsEmail.setObjType(Constants.ZERO+"");
- smsEmailMapper.insert(smsEmail);
-
- return smsEmail.getId();
+ SmsConfig smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getObjType,
+ SmsConstants.inventCode).last(" limit 1 "));
+ //寮�鍚煭淇￠�氱煡
+ if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
+ if(StringUtils.isNotBlank(smsConfig.getContent())){
+ String content = smsConfig.getContent().replace("{楠岃瘉鐮亇",code);
+ emayService.sendSmsByHk(smsEmail.getPhone(),content);
+ smsEmail.setRemark(code);
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setStatus(Constants.ZERO);
+ smsEmail.setType(Constants.ZERO);
+ smsEmail.setTitle("鐭俊楠岃瘉鐮�");
+ smsEmail.setContent(content);
+ smsEmail.setObjType(Constants.ZERO+"");
+ smsEmailMapper.insert(smsEmail);
+ return smsEmail.getId();
+ }
+ }
+ return null;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index c47964b..c55fe52 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -288,7 +288,7 @@
Collections.sort(jobList, new Comparator<Platform>() {
@Override
public int compare(Platform o1, Platform o2) {
- return Constants.formatBigdecimal(o2.getWorkCountTime())-Constants.formatBigdecimal(o1.getWorkCountTime());
+ return Constants.formatBigdecimal(o2.getWorkCountTime()).intValue() - Constants.formatBigdecimal(o1.getWorkCountTime()).intValue();
}
});
for(Platform model : jobList){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java
index 9dac56c..6aff297 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java
@@ -113,7 +113,7 @@
}catch (Exception e){
e.printStackTrace();
}
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐭俊鍙戦�佸け璐ワ紝璇风◢鍚庨噸璇曪紒");
+
}
--
Gitblit v1.9.3