From 77fe7aa70701677c4bdc78350c65f9807fb51398 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 15:55:18 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml | 2
server/system_service/pom.xml | 48 +++++++++++++----------
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/InternalHomeVO.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 1
server/system_gateway/src/main/resources/bootstrap-dev.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java | 8 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 5 +-
admin/.env.development | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 12 ------
10 files changed, 39 insertions(+), 45 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 19f2ddf..cf6b164 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,4 +1,5 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
-VUE_APP_API_URL = 'http://192.168.0.173/admin_interface'
+VUE_APP_API_URL = 'http://localhost:10010'
+#VUE_APP_API_URL = 'http://192.168.0.173/admin_interface'
diff --git a/server/system_gateway/src/main/resources/bootstrap-dev.yml b/server/system_gateway/src/main/resources/bootstrap-dev.yml
index 2066005..5f046f3 100644
--- a/server/system_gateway/src/main/resources/bootstrap-dev.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -7,7 +7,7 @@
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
- namespace: dev_renkang
+ namespace: dmvisit
username: nacos
password: nacos
gateway:
diff --git a/server/system_service/pom.xml b/server/system_service/pom.xml
index d54b462..22a532c 100644
--- a/server/system_service/pom.xml
+++ b/server/system_service/pom.xml
@@ -18,7 +18,7 @@
<swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
<fastjson.version>1.2.70</fastjson.version>
<druid.version>1.2.0</druid.version>
- <mybatis.plus.version>3.4.2</mybatis.plus.version>
+ <mybatis.plus.version>3.5.7</mybatis.plus.version>
<apache.shiro.version>1.7.0</apache.shiro.version>
<oshi.version>5.7.0</oshi.version>
<jna.version>5.7.0</jna.version>
@@ -68,27 +68,33 @@
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>1.3.0</version>
- <!--浣跨敤spring boot2鏁村悎 pagehelper-spring-boot-starter蹇呴』鎺掗櫎涓�涓嬩緷璧�
- 鍥犱负pagehelper-spring-boot-starter涔熷凡缁忓湪pom渚濊禆浜唌ybatis涓巑ybatis-spring
- 鎵�浠ヤ細涓巑ybatis-plus-boot-starter涓殑mybatis涓巑ybatis-spring鍙戠敓鍐茬獊
- -->
- <exclusions>
- <exclusion>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis-spring</artifactId>
- </exclusion>
- <!-- 瑙ｅ喅jsqlparser 渚濊禆鐗堟湰鍐茬獊-->
- <exclusion>
- <artifactId>jsqlparser</artifactId>
- <groupId>com.github.jsqlparser</groupId>
- </exclusion>
- </exclusions>
+ <version>2.1.0</version>
</dependency>
+
+ <!-- <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
+ <version>1.3.0</version>
+ <!–浣跨敤spring boot2鏁村悎 pagehelper-spring-boot-starter蹇呴』鎺掗櫎涓�涓嬩緷璧�
+ 鍥犱负pagehelper-spring-boot-starter涔熷凡缁忓湪pom渚濊禆浜唌ybatis涓巑ybatis-spring
+ 鎵�浠ヤ細涓巑ybatis-plus-boot-starter涓殑mybatis涓巑ybatis-spring鍙戠敓鍐茬獊
+ –>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis-spring</artifactId>
+ </exclusion>
+ <!– 瑙ｅ喅jsqlparser 渚濊禆鐗堟湰鍐茬獊–>
+ <!–<exclusion>
+ <artifactId>jsqlparser</artifactId>
+ <groupId>com.github.jsqlparser</groupId>
+ </exclusion>–>
+ </exclusions>
+ </dependency>-->
<!-- 杩炴帴姹� -->
<dependency>
<groupId>com.alibaba</groupId>
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
index d9853fc..3e1b380 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -24,7 +24,7 @@
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
- namespace: dev_renkang
+ namespace: dmvisit
username: nacos
password: nacos
# swagger閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java
index 6ece8b1..344f61e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java
@@ -27,16 +27,16 @@
private Long lwCount;
@ApiModelProperty(value = "鍦ㄥ満杞﹁締")
- private Integer presenceCarCount;
+ private Long presenceCarCount;
@ApiModelProperty(value = "棰勭害杞﹁締")
- private Integer visitorCarCount;
+ private Long visitorCarCount;
@ApiModelProperty(value = "闀挎湡杞﹁締")
- private Integer longCarCount;
+ private Long longCarCount;
@ApiModelProperty(value = "渚涘簲鍟嗘暟閲�")
- private Integer supplierCount;
+ private Long supplierCount;
@ApiModelProperty(value = "鍔冲姟鍏徃浜哄憳鏁�")
private List<Map<String,Object>> companyUsers;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 8478c38..9b557ab 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -236,11 +236,9 @@
@ApiModelProperty(value = "瑙掕壊缂栫爜鏌ヨ")
@TableField(exist = false)
private String roleIdParam;
-
@ApiModelProperty(value = "鍓嶇紑鍦板潃")
@TableField(exist = false)
private String prefixUrl;
-
@ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�,銆愯瀹㈢銆戝敮涓�鏍囪瘑",hidden = true )
@TableField(exist = false)
private Integer[] roleIds;
@@ -250,37 +248,28 @@
@ApiModelProperty(value = "鏈夋晥鏈熺被鍨� 0闀挎湡鏈夋晥 1鑷畾涔�",hidden = true )
@TableField(exist = false)
private Integer timeType;
-
//鏆傛棤浣跨敤
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
@TableField(exist = false)
private String keyword;
-
-
-
@ApiModelProperty(value = "鏄惁鏈変汉鑴革細0=鏃狅紱1=鏈夛紱")
@TableField(exist = false)
private Integer isFace;
-
@ApiModelProperty(value = "璁块棶娆℃暟")
@TableField(exist = false)
private Integer visitTimes;
-
@ApiModelProperty(value = "鏈�鍚庤闂椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastVisitDate;
-
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd")
private Date startTime;
@ApiModelProperty(value = "缂栫爜闆嗗悎")
@TableField(exist = false)
private List<Integer> idList;
-
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1")
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
private Date endTime;
-
@ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
@TableField(exist = false)
private String faceImgFull;
@@ -300,7 +289,6 @@
@ApiModelProperty(value = "鍩硅缁撴潫鏃堕棿")
@TableField(exist = false)
private Date trainEndTime;
-
@ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
@TableField(exist = false)
private List<String> roleNames;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/InternalHomeVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/InternalHomeVO.java
index 086bb3c..7376b5c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/InternalHomeVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/InternalHomeVO.java
@@ -20,7 +20,7 @@
private Long noticeDealNum;
@ApiModelProperty(value = "鎴戝彂璧风殑寰呭姙鏁伴噺")
- private Integer noticeCreateNum;
+ private Long noticeCreateNum;
@ApiModelProperty(value = "鎶勯�佺殑寰呭姙鏁伴噺")
private Long noticeCopyNum;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index ecb91fd..87ad1ae 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -1,7 +1,6 @@
package com.doumee.service.business.impl;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 1e84509..ea1e61c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -576,7 +576,7 @@
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
queryWrapper.eq(type!=null,Company::getType,type);
- queryWrapper.orderByAsc(Company::getSortnum );
+ queryWrapper.orderByAsc(true,"t.sortnum");
List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper);
//閰嶇疆缁勫憳浜哄憳绫诲瀷鏉ユ簮鏂瑰紡 0鑷缓 1ERP
CompanyTree treeBuild = new CompanyTree(companyList, dataSyncConfig.getOrgUserDataOrigin());
@@ -618,7 +618,8 @@
if (currentMenuIndex - 1 < 0) {
return;
}
- Company preMenu = companyPool.remove(currentMenuIndex - 1);
+ Company preMenu = companyPool.get(currentMenuIndex - 1);
+ companyPool.remove(currentMenuIndex - 1);
companyPool.add(currentMenuIndex, preMenu);
}
// 涓嬬Щ
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 7db9c0d..ebaf70d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
--
Gitblit v1.9.3