From 7d1abc56db2b67657070016c19640f815f627994 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期四, 14 十二月 2023 17:48:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java | 3
server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConfig.java | 61 ++
server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java | 33
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java | 17
server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java | 6
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java | 19
server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisUtil.java | 86 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 12
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 211 ++-----
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 504 ++++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java | 3
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java | 3
server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 10
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 18
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 52 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 20
server/openapi/src/main/java/com/doumee/api/web/ApiController.java | 7
server/dmvisit_service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java | 10
server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/UserActionJoinMapper.java | 7
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 5
server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java | 4
server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConverter.java | 38 +
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java | 4
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 12
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java | 23
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/TrainTimeJoinMapper.java | 13
server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java | 57 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 79 +-
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java | 3
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 13
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 88 ++
server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java | 55 +
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 11
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java | 59 +
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceJoinMapper.java | 8
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 20
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java | 15
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java | 1
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 6
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java | 4
46 files changed, 1,300 insertions(+), 312 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
index 3ea4554..5c38b14 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
@@ -69,7 +69,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:cars:query")
+ // @RequiresPermissions("business:cars:query")
public ApiResponse<PageData<Cars>> findPage (@RequestBody PageWrap<Cars> pageWrap) {
return ApiResponse.success(carsService.findPage(pageWrap));
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index 41cca71..b3480ae 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -73,7 +73,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:company:update")
public ApiResponse updateById(@RequestBody Company company) {
- companyService.updateById(company);
+ companyService.updateLaborServicesById(company);
return ApiResponse.success(null);
}
@@ -84,6 +84,14 @@
return ApiResponse.success(companyService.findPage(pageWrap));
}
+
+ @ApiOperation("淇敼鐘舵��")
+ @PostMapping("/updateStatusById")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse updateStatusById(@RequestBody Company company) {
+ companyService.updateStatusById(company);
+ return ApiResponse.success(null);
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:company:exportExcel")
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index edd1a97..e4eb4d3 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -78,11 +78,19 @@
return ApiResponse.success(null);
}
- @ApiOperation("鏍规嵁ID 绂佸惎鐢� 鎷夐粦")
+ @ApiOperation("鏍规嵁ID 绂佸惎鐢� ")
@PostMapping("/updateStatusById")
@RequiresPermissions("business:member:update")
public ApiResponse updateStatusById(@RequestBody Member member){
memberService.updateStatusById(member);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("浜哄憳鎷夐粦")
+ @PostMapping("/updateVisitsStatusById")
+ @RequiresPermissions("business:member:update")
+ public ApiResponse updateVisitsStatusById(@RequestBody Member member){
+ memberService.updateVisitsStatusById(member);
return ApiResponse.success(null);
}
@@ -103,7 +111,7 @@
@ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ")
@PostMapping("/findLaborMemberInfoPage")
-// @RequiresPermissions("business:member:query")
+ @RequiresPermissions("business:member:query")
public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
}
@@ -135,4 +143,12 @@
public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
}
+
+ @ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
+ @PostMapping("/findVisitPage")
+ @RequiresPermissions("business:member:query")
+ public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+ return ApiResponse.success(memberService.findVisitPage(pageWrap));
+ }
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java
index 065a6cd..43dc056 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java
@@ -18,14 +18,14 @@
/**
* 鐢ㄦ埛id
*/
- private Integer memberId;
+ private String memberId;
private long expire;
public JwtPayLoad() {
}
- public JwtPayLoad(Integer memberId) {
+ public JwtPayLoad(String memberId) {
this.memberId = memberId;
}
@@ -52,7 +52,7 @@
return new JwtPayLoad();
} else {
JwtPayLoad jwtPayLoad = new JwtPayLoad();
- jwtPayLoad.setMemberId((Integer) map.get("memberId"));
+ jwtPayLoad.setMemberId((String) map.get("memberId"));
return jwtPayLoad;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
index e368861..9609518 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
@@ -126,7 +126,7 @@
/**
* 鐢熸垚token,鏍规嵁userId鍜岃繃鏈熸椂闂�
*/
- public static String generateToken(Integer userId, Date exppiredDate, Map<String, Object> claims) {
+ public static String generateToken(String userId, Date exppiredDate, Map<String, Object> claims) {
final Date createdDate = new Date();
String secret = getJwtSecret();
diff --git a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
index 39f139d..8081e3e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
@@ -1,14 +1,19 @@
package com.doumee.config.Jwt;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.annotation.ErpLoginRequired;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.redis.RedisUtil;
import io.jsonwebtoken.JwtException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.method.HandlerMethod;
@@ -26,6 +31,12 @@
@Autowired
private JdbcTemplate dao;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private RedisTemplate<String,Object> redisTemplate;
/**
* 娣诲姞鎷︽埅鍣�
@@ -47,7 +58,7 @@
// Method method = handlerMethod.getMethod();
// 鏈� @LoginRequired 娉ㄨВ锛岄渶瑕佺櫥褰曡璇�
- if (beanType.isAnnotationPresent(LoginRequired.class)) {
+ if (beanType.isAnnotationPresent(LoginRequired.class) || handlerMethod.hasMethodAnnotation(LoginRequired.class)) {
//鑾峰彇token
String token = request.getHeader(JwtTokenUtil.HEADER_KEY); // 浠� http 璇锋眰澶翠腑鍙栧嚭 token
if (StringUtils.isNotBlank(token)) {
@@ -55,12 +66,16 @@
} else {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
- }else if (handlerMethod.hasMethodAnnotation(LoginRequired.class)){
- //鑾峰彇token
- String token = request.getHeader(JwtTokenUtil.HEADER_KEY); // 浠� http 璇锋眰澶翠腑鍙栧嚭 token
- if (StringUtils.isNotBlank(token)) {
- checkLogin(request,response);
- } else {
+ } else if(beanType.isAnnotationPresent(ErpLoginRequired.class) || handlerMethod.hasMethodAnnotation(ErpLoginRequired.class)){
+ try {
+ //ERP 涓氬姟娉ㄨВ
+ String token = request.getHeader(JwtTokenUtil.HEADER_KEY);
+ String redisToken = RedisUtil.getObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,String.class);
+ if(StringUtils.isBlank(redisToken)||!token.equals(redisToken)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈櫥褰�");
+ }
+ request.setAttribute(JwtTokenUtil.HEADER_KEY,token);
+ } catch (IllegalArgumentException | JwtException e) {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
// request.setAttribute("token", token);
@@ -68,7 +83,7 @@
return true;
}
};
- registry.addInterceptor(TokenInterceptor).addPathPatterns("/web/**");
+ registry.addInterceptor(TokenInterceptor).addPathPatterns("/web/**","/visitbiz/**");
}
@@ -82,7 +97,7 @@
throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
}
//鑾峰彇璐﹀彿ID
- Integer memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
+ String memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
Integer isDeleted = dao.queryForObject(" select COALESCE(DELETED,1) from `system_user` where id = ?", Integer.class, memberId);
if(isDeleted== Constants.ONE){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
diff --git a/server/dmvisit_service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java b/server/dmvisit_service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java
new file mode 100644
index 0000000..971a6ff
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java
@@ -0,0 +1,10 @@
+package com.doumee.config.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD,ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ErpLoginRequired {}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
index 63ce885..5a0877b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseRequst.java
@@ -1,8 +1,12 @@
package com.doumee.core.haikang.model.param;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
@Data
public class BaseRequst<T> {
private T data;
+ @ApiModelProperty(hidden = true)
+ private String token;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
index 8afb6bf..9bdd2f0 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
@@ -1,5 +1,6 @@
package com.doumee.core.model.openapi.request;
+import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,7 +11,7 @@
*/
@Data
@ApiModel("闂ㄧ鍑哄叆浜嬩欢鍚屾璇锋眰淇℃伅")
-public class CarEventListRequest {
+public class CarEventListRequest extends BaseRequst {
@ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
private Integer eventId;
@ApiModelProperty(value = "鍋滆溅搴撶紪鐮侊紙璁垮绔疘D锛�" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
index c675a66..5268119 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
@@ -1,5 +1,6 @@
package com.doumee.core.model.openapi.request;
+import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,7 +11,7 @@
*/
@Data
@ApiModel("闂ㄧ鍑哄叆浜嬩欢鍚屾璇锋眰淇℃伅")
-public class DoorEventListRequest {
+public class DoorEventListRequest extends BaseRequst {
@ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
private Integer eventId;
@ApiModelProperty(value = "濮撳悕,鏀寔妯＄硦鍖归厤" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
index d648d12..206af61 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
@@ -1,5 +1,6 @@
package com.doumee.core.model.openapi.request;
+import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,20 +13,22 @@
*/
@Data
@ApiModel("缁勭粐淇℃伅鏇存柊璇锋眰淇℃伅")
-public class OrgUpdateRequest {
- @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
- private Integer id;
- @ApiModelProperty(value = "鍚嶇О" )
+public class OrgUpdateRequest extends BaseRequst {
+ @ApiModelProperty(value = "鍞竴鏍囪瘑" ,required = true)
+ private String id;
+ @ApiModelProperty(value = "鍚嶇О" ,required = true)
private String name;
+ @ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜")
+ private String parentId;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�",example = "0")
private int isdeleted ;
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤",example = "0")
private int status ;
- @ApiModelProperty(value = "鏇存柊鏃堕棿,濡�2023-11-24 09:47:36")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿,濡�2023-11-24 09:47:36",required = true)
private Date editDate;
- @ApiModelProperty(value = "鑱旂郴浜哄鍚�")
+ @ApiModelProperty(value = "鑱旂郴浜哄鍚�",required = true)
private String linkName;
- @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽",required = true)
private String linkPhone;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
index dc3b8bd..707073f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
@@ -1,5 +1,6 @@
package com.doumee.core.model.openapi.request;
+import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,7 +11,7 @@
*/
@Data
@ApiModel("鍋滆溅搴撴帴鍙ｈ姹備俊鎭�")
-public class ParkListRequest {
+public class ParkListRequest extends BaseRequst {
@ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
private Integer id;
@ApiModelProperty(value = "鍚嶇О,鏀寔妯＄硦鍖归厤" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
index 79f3172..5735992 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
@@ -1,5 +1,6 @@
package com.doumee.core.model.openapi.request;
+import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,9 +12,10 @@
*/
@Data
@ApiModel("闂ㄧ缁勬帴鍙ｈ姹備俊鎭�")
-public class RoleListRequest {
+public class RoleListRequest extends BaseRequst {
@ApiModelProperty(value = "闂ㄧ缁勫敮涓�鏍囪瘑" ,example = "1")
private Integer id;
@ApiModelProperty(value = "鍚嶇О,鏀寔妯＄硦鍖归厤" )
private String name;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java
new file mode 100644
index 0000000..71dbbab
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java
@@ -0,0 +1,19 @@
+package com.doumee.core.model.openapi.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鍒嗙被淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("Token鑾峰彇绫�")
+public class TokenRequest {
+ @ApiModelProperty(value = "璁块棶key" ,example = "1")
+ private String accessKey;
+ @ApiModelProperty(value = "璁块棶绉橀挜" )
+ private String accessSecret;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
index 430c1e4..9e26308 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
@@ -1,5 +1,6 @@
package com.doumee.core.model.openapi.request;
+import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,16 +14,16 @@
*/
@Data
@ApiModel("浜哄憳淇℃伅鏇存柊璇锋眰淇℃伅")
-public class UserUpdateRequest {
- @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
- private Integer id;
- @ApiModelProperty(value = "濮撳悕" )
+public class UserUpdateRequest extends BaseRequst {
+ @ApiModelProperty(value = "鍞竴鏍囪瘑" ,required = true)
+ private String id;
+ @ApiModelProperty(value = "濮撳悕" ,required = true)
private String name;
- @ApiModelProperty(value = "璇佷欢鍙�" )
+ @ApiModelProperty(value = "璇佷欢鍙�" ,required = true)
private String idNo;
- @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境閫氳璇� 2鎶ょ収 ,榛樿涓�0" ,example = "0")
+ @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境閫氳璇� 2鎶ょ収 ,榛樿涓�0" ,required = true)
private int idType;
- @ApiModelProperty(value = "璁垮鎬у埆 1-鐢� 2-濂�" ,example = "1")
+ @ApiModelProperty(value = "璁垮鎬у埆 1-鐢� 2-濂�" ,required = true)
private Integer sex;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�",example = "0")
private int isdeleted ;
@@ -30,11 +31,11 @@
private int status ;
@ApiModelProperty(value = "鏇存柊鏃堕棿,濡�2023-11-24 09:47:36")
private Date editDate;
- @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�")
- private String orgId;
- @ApiModelProperty(value = "浜鸿劯鐓х墖鍦板潃")
+ @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�" ,required = true)
+ private Integer orgId;
+ @ApiModelProperty(value = "浜鸿劯鐓х墖鍦板潃" ,required = true)
private String faceImg;
- @ApiModelProperty(value = "宸ュ彿")
+ @ApiModelProperty(value = "宸ュ彿" ,required = true)
private String code;
@ApiModelProperty(value = "鎵嬫満鍙�" , required = true)
private String phone;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
index 028486b..e476921 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
@@ -1,5 +1,6 @@
package com.doumee.core.model.openapi.request;
+import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,7 +11,7 @@
*/
@Data
@ApiModel("璁垮鍑哄叆浜嬩欢鍚屾璇锋眰淇℃伅")
-public class VisitListRequest {
+public class VisitListRequest extends BaseRequst {
@ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
private Integer eventId;
@ApiModelProperty(value = "璁垮鍚嶇О,鏀寔妯＄硦鍖归厤" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
index c4cf71d..fcbcd76 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
@@ -62,19 +62,4 @@
@ApiModelProperty(value = "瀛愬搧鐗屽勾娆�")
private Integer subModel;
- @ApiModelProperty(value = "浜哄憳绫诲瀷锛�0 鏈煡锛�1 鏅�氾紝2 鏉ュ锛�3 榛戝悕鍗曪紝4 绠＄悊鍛�",example = "1")
- private Integer type;
- @ApiModelProperty(value = "杩涘嚭绫诲瀷 1-杩� 0-鍑� -1:鏈煡",example = "1" )
- private Integer eventInOut;
- @ApiModelProperty(value = "浜哄憳閫氶亾鍙�" ,example = "1")
- private Integer extAccessChannel;
- @ApiModelProperty(value = "浜х敓鏃堕棿" )
- private String createTime ;
- @ApiModelProperty(value = "浜烘墜鏈哄彿" )
- private String phone ;
- @ApiModelProperty(value = "浜哄憳Id锛坋rp绔敤鎴风紪鐮侊級" )
- private String userId ;
- @ApiModelProperty(value = "鎵�灞炵粍缁嘔d(erp绔粍缁囩紪鐮�)" )
- private String orgId ;
-
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
index d28152d..f786218 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
@@ -17,7 +17,6 @@
private Integer eventId;
@ApiModelProperty(value = "浜嬩欢绫诲瀷 0-浜鸿劯璁よ瘉閫氳繃锛�196893锛� 1-鍒峰崱璁よ瘉閫氳繃锛�198915锛�" )
private String eventType;
-
@ApiModelProperty(value = "鎬у埆 1-鐢� 2-濂�" ,example = "1")
private Integer sex;
@ApiModelProperty(value = "璁惧鍚嶇О" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
index 51c7968..fce5f57 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
@@ -15,7 +15,7 @@
@ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
private Integer id;
- @ApiModelProperty(value = "" )
+ @ApiModelProperty(value = "鍚嶇О" )
private String name;
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
private Integer status;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 47a1f0e..73e6cc5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -50,7 +50,12 @@
public static final String CAR_EVENT_IMG = "CAR_EVENT_IMG";
public static final String DEVICE_EVENT_IMG = "DEVICE_EVENT_IMG";
public static boolean DEALING_HK_IMG = false;
-
+ // ERP鎺ュ彛閰嶇疆
+ public static final String ERP_CONFIG = "ERP_CONFIG";
+ // ERP ACCESS_KEY
+ public static final String ERP_ACCESS_KEY = "ERP_ACCESS_KEY";
+ // ERP ACCESS_SECRET
+ public static final String ERP_ACCESS_SECRET = "ERP_ACCESS_SECRET";
public static Date getBirthdyByCardNo(String idCard){
if(idCard ==null || idCard.length()<14){
@@ -153,6 +158,7 @@
+
public static final String WX_PLATFORM = "WX_PLATFORM";
public static final String WX_PLATFORM_ACCESS_TOKEN = "WX_PLATFORM_ACCESS_TOKEN";
public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
@@ -164,6 +170,9 @@
public interface RedisKeys {
+ public static final String ERP_TOKEN ="ERP_TOKEN";
+ public static final long EXPIRE_TIME = 7200;
+
public static final String GOODSORDER_KEY = "ordercode_";
public static final String ACTIVITY_SIGN_KEY = "actcode_";
public static final String AFTERSALE_KEY = "salecode_";
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConfig.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConfig.java
new file mode 100644
index 0000000..e463111
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConfig.java
@@ -0,0 +1,61 @@
+package com.doumee.core.utils.redis;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * @author jiangping
+ * @date 2021-8-10 14:40:35
+ * redis閰嶇疆
+ */
+@Configuration
+public class RedisConfig {
+
+ @Bean
+ @SuppressWarnings("all")
+ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+ RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
+ template.setConnectionFactory(factory);
+ Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+ ObjectMapper om = new ObjectMapper();
+ om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+ om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
+ jackson2JsonRedisSerializer.setObjectMapper(om);
+ StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+ // key閲囩敤String鐨勫簭鍒楀寲鏂瑰紡
+ template.setKeySerializer(stringRedisSerializer);
+ // hash鐨刱ey涔熼噰鐢⊿tring鐨勫簭鍒楀寲鏂瑰紡
+ template.setHashKeySerializer(stringRedisSerializer);
+ // value搴忓垪鍖栨柟寮忛噰鐢╦ackson
+ template.setValueSerializer(jackson2JsonRedisSerializer);
+ // hash鐨剉alue搴忓垪鍖栨柟寮忛噰鐢╦ackson
+ template.setHashValueSerializer(jackson2JsonRedisSerializer);
+ template.afterPropertiesSet();
+ return template;
+ }
+}
+/*@Configuration
+public class RedisConfig {
+
+ *//**
+ * @param factory
+ * @return 鑷畾涔塺edisTemplate锛岃嚜甯︾殑bean娌℃湁搴忓垪鍖栧櫒
+ *//*
+ @Bean
+ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+ RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+ redisTemplate.setConnectionFactory(factory);
+ redisTemplate.setKeySerializer(new StringRedisSerializer());//璁剧疆key鐨勫簭鍒楀寲鍣�
+ redisTemplate.setValueSerializer(new RedisConverter());//璁剧疆鍊肩殑搴忓垪鍖栧櫒
+ return redisTemplate;
+ }
+
+}*/
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConverter.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConverter.java
new file mode 100644
index 0000000..ff27fcd
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisConverter.java
@@ -0,0 +1,38 @@
+package com.doumee.core.utils.redis;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.serializer.support.DeserializingConverter;
+import org.springframework.core.serializer.support.SerializingConverter;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.SerializationException;
+
+/**
+ * @author 褰紵
+ * @date 2018/8/28 9:31
+ */
+public class RedisConverter implements RedisSerializer<Object> {
+ private Converter<Object, byte[]> serializer = new SerializingConverter();//搴忓垪鍖栧櫒
+ private Converter<byte[], Object> deserializer = new DeserializingConverter();//鍙嶅簭鍒楀寲鍣�
+
+ @Override
+ public byte[] serialize(Object o) throws SerializationException {//灏嗗璞″簭鍒楀寲鎴愬瓧鑺傛暟缁�
+ if (o == null) return new byte[0];
+ try {
+ return serializer.convert(o);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new byte[0];
+ }
+ }
+
+ @Override
+ public Object deserialize(byte[] bytes) throws SerializationException {//灏嗗瓧鑺傛暟缁勫弽搴忓垪鍖栨垚瀵硅薄
+ if (bytes == null || bytes.length == 0) return null;
+ try {
+ return deserializer.convert(bytes);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisUtil.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisUtil.java
new file mode 100644
index 0000000..28d5cb9
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/redis/RedisUtil.java
@@ -0,0 +1,86 @@
+package com.doumee.core.utils.redis;
+
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import java.util.concurrent.TimeUnit;
+
+public class RedisUtil {
+ /**
+ * 娣诲姞涓�涓猇alue涓篠tring
+ * @param stringRedisTemplate
+ * @param key
+ * @param str
+ */
+ public static void addString( StringRedisTemplate stringRedisTemplate, String key, String str) {
+ //1,娣诲姞涓�涓猇alue涓篠tring
+ stringRedisTemplate.opsForValue().set(key, str);
+
+ }
+
+ /**
+ * 鏍规嵁key鍒犻櫎瀛楃涓茬紦瀛�
+ * @param stringRedisTemplate
+ * @param key
+ */
+ public static void delString( StringRedisTemplate stringRedisTemplate, String key ) {
+ //1,娣诲姞涓�涓猇alue涓篠tring
+ stringRedisTemplate.delete(key);
+
+ }
+
+ /**
+ * 鏍规嵁key鍒犻櫎瀵硅薄鏁版嵁
+ * @param redisTemplate
+ * @param key
+ */
+ public static void deleteObject( RedisTemplate<String, Object> redisTemplate , String key ) {
+
+ redisTemplate.delete(key);
+
+ }
+ /**
+ * 娣诲姞涓�涓猇alue涓哄璞�
+ * @param redisTemplate
+ * @param key
+ * @param obj
+ */
+ public static void addObject(RedisTemplate<String, Object> redisTemplate , String key, Object obj) {
+ redisTemplate.opsForValue().set(key, obj);
+ }
+ /**
+ * 娣诲姞涓�涓猇alue涓哄璞�
+ * @param redisTemplate
+ * @param key
+ * @param obj
+ */
+ public static void addObject(RedisTemplate<String, Object> redisTemplate , String key, Object obj,long time) {
+// redisTemplate.opsForValue().set(key, obj);
+ redisTemplate.opsForValue().set(key,obj,time, TimeUnit.SECONDS);
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟瀵硅薄绫诲瀷锛岃繑鍥炵浉搴旂紦瀛樺璞℃暟鎹�
+ * @param stringRedisTemplate
+ * @param key
+ * @return
+ */
+ public static String getString(StringRedisTemplate stringRedisTemplate, String key){
+ String val = stringRedisTemplate.opsForValue().get(key);
+ return val;
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟瀵硅薄绫诲瀷锛岃繑鍥炵浉搴旂紦瀛樺璞℃暟鎹�
+ * @param redisTemplate
+ * @param key
+ * @param clazz
+ * @param <T>
+ * @return
+ */
+ public static <T> T getObject(RedisTemplate<String, Object> redisTemplate , String key,Class<T> clazz){
+ T t = (T) redisTemplate.opsForValue().get(key);
+ return t;
+ }
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
index 29b75cc..b7ef45b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -30,4 +30,17 @@
@ApiModelProperty(value = "鍏徃IDs")
private List<Integer> companyIds;
+ @ApiModelProperty(value = "濮撳悕")
+ private String name;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String phone;
+
+ @ApiModelProperty(value = "鍏徃鍚嶇О")
+ private String companyName;
+
+ @ApiModelProperty(value = "韬唤璇佸彿")
+ private String idcardNo;
+
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
index 42563f5..7a66b78 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
@@ -1,5 +1,6 @@
package com.doumee.dao.admin.response;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -104,4 +105,15 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date empowerEndTime;
+ @ApiModelProperty(value = "鎷滆娆℃暟")
+ @TableField(exist = false)
+ private Integer visitsCount;
+
+ @ApiModelProperty(value = "鏈�鍚庤瀹㈡椂闂�")
+ @TableField(exist = false)
+ private Date visitsLastDate;
+
+
+
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceJoinMapper.java
new file mode 100644
index 0000000..73bbfd7
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceJoinMapper.java
@@ -0,0 +1,8 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.Device;
+import com.doumee.dao.business.model.UserAction;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+public interface DeviceJoinMapper extends MPJJoinMapper<Device> {
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/TrainTimeJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/TrainTimeJoinMapper.java
new file mode 100644
index 0000000..47a6923
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/TrainTimeJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.TrainTime;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+public interface TrainTimeJoinMapper extends MPJJoinMapper<TrainTime> {
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/UserActionJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/UserActionJoinMapper.java
new file mode 100644
index 0000000..c166202
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/UserActionJoinMapper.java
@@ -0,0 +1,7 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.UserAction;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+public interface UserActionJoinMapper extends MPJJoinMapper<UserAction> {
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
index 1e483b8..d55e19a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
@@ -20,7 +20,7 @@
@TableName("`cars`")
public class Cars {
- @TableId(type = IdType.AUTO)
+ @TableId(value = "id",type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
private Integer id;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
index 875d8cd..c69f152 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -114,6 +114,7 @@
@ApiModelProperty(value = "ERP鏍囪瘑")
@ExcelColumn(name="ERP鏍囪瘑")
private String erpId;
+
@ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
@ExcelColumn(name="璐熻矗浜虹紪鐮�")
private String headId;
@@ -160,4 +161,9 @@
@TableField(exist = false)
private String headPhone;
+ @ApiModelProperty(value = "涓婄骇缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String parentName;
+
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 922f31e..de1a53f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -152,7 +152,7 @@
@ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
@ExcelColumn(name="ERP鏍囪瘑")
- private Integer erpId;
+ private String erpId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
index 98b82af..1bcb540 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,53 +23,77 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private String creator;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date createDate;
+
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private String edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "浜哄憳缂栫爜", example = "1")
- @ExcelColumn(name="浜哄憳缂栫爜")
private Integer memberId;
@ApiModelProperty(value = "鏈夋晥鏈熷紑濮�")
- @ExcelColumn(name="鏈夋晥鏈熷紑濮�")
private Date startTime;
- @ApiModelProperty(value = "鏈夋晥鏈熺粨鏉�", example = "1")
- @ExcelColumn(name="鏈夋晥鏈熺粨鏉�")
- private Date endTime;
+
@ApiModelProperty(value = "瀵煎叆鐘舵��", example = "1")
- @ExcelColumn(name="瀵煎叆鐘舵��")
private Integer importStatus;
@ApiModelProperty(value = "瀵煎叆澶囨敞")
- @ExcelColumn(name="瀵煎叆澶囨敞")
private String importInfo;
+
+
+ @ApiModelProperty(value = "濮撳悕")
+ @TableField(exist = false)
+ @ExcelColumn(name="濮撳悕", index = 1)
+ private String name;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎵嬫満鍙�", index = 2)
+ private String phone;
+
+ @ApiModelProperty(value = "韬唤璇�")
+ @TableField(exist = false)
+ @ExcelColumn(name="韬唤璇�", index = 3)
+ private String idcardNo;
+
+
+
+ @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎵�灞炲叕鍙�", index = 4)
+ private String companyName;
+
+ @ApiModelProperty(value = "鎿嶄綔浜�")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎿嶄綔浜�", index = 5)
+ private String createName;
+
+ @ApiModelProperty(value = "鍩硅鏃堕棿鑷�", example = "1")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍩硅鏃堕棿鑷�", index = 6 ,dateFormat="yyyy-MM-dd")
+ private Date endTime;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鎿嶄綔鏃堕棿", index = 7 ,dateFormat="yyyy-MM-dd")
+ private Date createDate;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 607c84d..f9866dc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -228,4 +228,24 @@
@TableField(exist = false)
private List<Integer> lwWithUserList;
+ @ApiModelProperty(value = "琚浜哄憳濮撳悕", example = "1")
+ @ExcelColumn(name="琚浜哄憳濮撳悕")
+ @TableField(exist = false)
+ private String receptMemberName;
+
+ @ApiModelProperty(value = "琚浜哄憳閮ㄩ棬", example = "1")
+ @ExcelColumn(name="琚浜哄憳閮ㄩ棬")
+ @TableField(exist = false)
+ private String receptMemberDepartment;
+
+ @ApiModelProperty(value = "闂ㄧ闆嗗悎", example = "1")
+ @ExcelColumn(name="闂ㄧ闆嗗悎")
+ @TableField(exist = false)
+ private List<Device> deviceList;
+
+ @ApiModelProperty(value = "闅忚浜哄憳鍒楄〃", example = "1")
+ @ExcelColumn(name="闅忚浜哄憳鍒楄〃")
+ @TableField(exist = false)
+ private List<Visits> visitsList;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
index c7cf7a1..4bfefb3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -103,6 +103,8 @@
* @return PageData<Company>
*/
PageData<Company> findPage(PageWrap<Company> pageWrap);
+
+ void updateStatusById(Company company);
/**
* 鏉′欢缁熻
*
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
index 62ec5a3..06d371a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
@@ -2,6 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.request.RoleListRequest;
+import com.doumee.core.model.openapi.response.RoleListResponse;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.dao.web.response.DeviceRoleVO;
@@ -108,4 +110,6 @@
List<DeviceRoleVO> findListByType(Integer type);
+
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
index 83bdbc4..37bc20f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
@@ -1,11 +1,16 @@
package com.doumee.service.business;
import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
-import com.doumee.core.haikang.model.param.request.ParkListRequest;
import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.request.*;
import com.doumee.core.model.openapi.request.erp.OrgListRequest;
import com.doumee.core.model.openapi.request.erp.UserInfoRequest;
import com.doumee.core.model.openapi.request.erp.UserListRequest;
+import com.doumee.core.model.openapi.response.*;
+
+import java.util.List;
/**
* 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹氫箟
@@ -34,4 +39,54 @@
* @return
*/
String syncUserInfo(UserInfoRequest param);
+
+
+ /**
+ * 鍒涘缓ERP璁块棶浠ょ墝
+ * @param accessKey
+ * @param accessSecret
+ * @return
+ */
+ AccessTokenResponse createERPToken(String accessKey, String accessSecret);
+
+
+ /**
+ * 闂ㄧ缁勫叏閲忔帴鍙�
+ * @param param
+ * @return
+ */
+ List<RoleListResponse> erpQueryDeviceList(RoleListRequest param);
+
+ /**
+ * 鍋滆溅鍦哄叏閲忎俊鎭帴鍙�
+ * @param param
+ * @return
+ */
+ List<ParkListResponse> parkList(ParkListRequest param);
+
+ /**
+ * 璁垮鍑哄叆浜嬩欢鍚屾鎺ュ彛
+ * @param param
+ * @return
+ */
+ PageData<VisitEventListResponse> visitListPage(PageWrap<VisitListRequest> param);
+
+
+ /**
+ * 闂ㄧ鍑哄叆浜嬩欢鍚屾鎺ュ彛
+ * @param param
+ * @return
+ */
+ PageData<DoorEventListResponse> doorEventListPage(PageWrap<DoorEventListRequest> param);
+
+ /**
+ * 杞﹁締鍑哄叆浜嬩欢鍚屾鎺ュ彛
+ * @param param
+ * @return
+ */
+ PageData<CarEventListResponse> carEventList(PageWrap<CarEventListRequest> param);
+
+ void orgUpdate(OrgUpdateRequest param);
+
+ void userUpdate(UserUpdateRequest param);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 75ae96d..55b51c1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.response.AccessTokenResponse;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
@@ -72,6 +73,8 @@
* @param member 瀹炰綋瀵硅薄
*/
void updateStatusById(Member member);
+
+ void updateVisitsStatusById(Member member);
void updateCanVisitById(Member member);
/**
@@ -148,6 +151,7 @@
*/
PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
+ PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap);
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
@@ -163,7 +167,6 @@
MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
-
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index a9e946f..fa224c3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -2,10 +2,12 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.CarsQuery;
import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.CarsMapper;
+import com.doumee.dao.business.join.CarJoinMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.CarsService;
@@ -30,6 +32,9 @@
@Autowired
private CarsMapper carsMapper;
+
+ @Autowired
+ private CarJoinMapper carJoinMapper;
@Autowired
private ParkBookJoinMapper parkBookJoinMapper;
@@ -93,6 +98,13 @@
@Override
public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {
+
+ MPJLambdaWrapper<Cars> visRecord = new MPJLambdaWrapper<>();
+ visRecord.selectAll(Cars.class);
+ visRecord.eq(Cars::getIsdeleted, Constants.ZERO);
+ visRecord.eq(Cars::getId, Constants.ZERO);
+ Cars result = carJoinMapper.selectJoinOne(Cars.class,visRecord);
+
IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Cars> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 68aca87..2ef7904 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -24,6 +24,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -83,7 +84,14 @@
@Override
public void deleteById(Integer id) {
- companyMapper.deleteById(id);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ Company company=new Company();
+ company.setId(id);
+ company.setIsdeleted(Constants.ZERO);
+ company.setEditDate(new Date());
+ company.setEditor(loginUserInfo.getId());
+ companyMapper.updateById(company);
}
@Override
@@ -97,7 +105,17 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- companyMapper.deleteBatchIds(ids);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Company company=new Company();
+
+ // companyMapper.deleteBatchIds(ids);
+ ids.stream().forEach(s->{
+ company.setId(s);
+ company.setIsdeleted(Constants.ZERO);
+ company.setEditDate(new Date());
+ company.setEditor(loginUserInfo.getId());
+ companyMapper.updateById(company);
+ });
}
@Override
@@ -166,7 +184,7 @@
queryWrapper.eq(Company::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.eq(Company::getName, pageWrap.getModel().getName());
+ queryWrapper.like(Company::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getRemark() != null) {
queryWrapper.eq(Company::getRemark, pageWrap.getModel().getRemark());
@@ -239,18 +257,36 @@
queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
}
queryWrapper.orderByDesc(Company::getCreateDate);
- queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId)
- .leftJoin(Member.class, Member::getId,Company::getHeadId);
+ queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId);
+ /* .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
+ /* queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
queryWrapper.selectAll(Company.class)
- .selectAs(Category::getName,Company::getCategoryName)
- .selectAs(Member::getName,Company::getHeadName)
+ .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum")
+ /*.select("c.name as parentName");*/
+ .selectAs(Category::getName,Company::getCategoryName);
+ /* .selectAs(Member::getName,Company::getHeadName)
.selectAs(Member::getPhone,Company::getHeadPhone)
- .select("count(t1.id) as countNum");
+ .select("count(t1.id) as countNum");*/
+ queryWrapper.eq(Company::getType,Constants.ZERO);
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
return PageData.from(companyIPage);
}
@Override
+ public void updateStatusById(Company company) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ company.setEditDate(new Date());
+ company.setEditor(loginUserInfo.getId());
+ company.setStatus(company.getStatus());
+ companyMapper.updateById(company);
+ }
+
+
+ @Override
public long count(Company company) {
QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
return companyMapper.selectCount(wrapper);
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 7449ddc..a5b0b7d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -5,8 +5,12 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.request.RoleListRequest;
+import com.doumee.core.model.openapi.response.DeviceListResponse;
+import com.doumee.core.model.openapi.response.RoleListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.DeviceMapper;
import com.doumee.dao.business.DeviceRoleMapper;
import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.DeviceRole;
@@ -16,17 +20,19 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 闂ㄧ瑙掕壊淇℃伅琛⊿ervice瀹炵幇
@@ -38,6 +44,7 @@
@Autowired
private DeviceRoleMapper deviceRoleMapper;
+
@Override
public Integer create(DeviceRole deviceRole) {
@@ -248,4 +255,9 @@
}
+
+
+
+
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 983da41..8bdd4a9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -28,6 +28,7 @@
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.TrainTimeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
+import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
@@ -70,6 +71,8 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private UserActionJoinMapper userActionJoinMapper;
@Override
public Integer create(Member member) {
@@ -119,7 +122,7 @@
insert.setParentId(member.getParentId());
memberMapper.insert(insert);
- TrainTime trainTime = new TrainTime();
+ /* TrainTime trainTime = new TrainTime();
trainTime.setCreator(loginUserInfo.getId().toString());
trainTime.setCreateDate(new Date());
trainTime.setEdirot(loginUserInfo.getId().toString());
@@ -130,13 +133,20 @@
trainTime.setEndTime(Utils.Date.getDayEnd(member.getEndTime()));
// trainTime.setImportStatus();
// trainTime.setImportInfo();
- trainTimeMapper.insert(trainTime);
+ trainTimeMapper.insert(trainTime);*/
return insert.getId();
}
@Override
public void deleteById(Integer id) {
- memberMapper.deleteById(id);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ Member member=new Member();
+ member.setId(id);
+ member.setIsdeleted(Constants.ZERO);
+ member.setEditor(loginUserInfo.getId());
+ member.setEditDate(new Date());
+ memberMapper.updateById(member);
}
@Override
@@ -150,7 +160,16 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- memberMapper.deleteBatchIds(ids);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member member=new Member();
+ ids.stream().forEach(s ->{
+ member.setId(s);
+ member.setIsdeleted(Constants.ZERO);
+ member.setEditor(loginUserInfo.getId());
+ member.setEditDate(new Date());
+ memberMapper.updateById(member);
+ });
+ /* memberMapper.deleteBatchIds(ids);*/
}
@Override
@@ -167,6 +186,30 @@
update.setStatus(member.getStatus());
memberMapper.updateById(update);
}
+
+
+ @Override
+ public void updateVisitsStatusById(Member member) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member result=memberMapper.selectById(member.getId());
+ Integer status=result.getStatus();
+ Member update = new Member();
+ update.setEditDate(new Date());
+ update.setEditor(loginUserInfo.getId());
+ update.setStatus(member.getStatus());
+ update.setId(member.getId());
+ memberMapper.updateById(update);
+
+ UserAction userAction=new UserAction();
+ userAction.setIsdeleted(Constants.ZERO);
+ userAction.setCreateDate(new Date());
+ userAction.setCreator(loginUserInfo.getId());
+ userAction.setType(Constants.TWO);
+ userAction.setMemberId(result.getId()+"");
+ userAction.setBeforeStatus(status);
+ userActionJoinMapper.insert(userAction);
+ }
+
@Override
@@ -354,16 +397,17 @@
MemberInfoDTO model = pageWrap.getModel();
Utils.MP.blankToNull(model);
Date end =pageWrap.getModel().getTrainTimeEndTime() !=null? Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime()):new Date();
- queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
- .leftJoin(Empower.class,Empower::getMemberId,Member::getId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ /* .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
+ .leftJoin(Empower.class,Empower::getMemberId,Member::getId);*/
queryWrapper.selectAll(Member.class)
.selectAs(Company::getName,MemberInfoDTO::getCompanyName)
.selectAs(Company::getLinkName,MemberInfoDTO::getLinkName)
- .select("Max(t1.endTime)","trainTimeEndTime")
- .select("Max(t2.endTime)","empowerEndTime");
+ /*.select(" (select Max(tt.END_TIME) from train_time tt where tt.ISDELETED=0 and tt.MEMBER_ID=t.id) as trainTimeEndTime")*/
+ .select(" (select Max(e.END_TIME) from empower e where e.ISDELETED=0 and e.MEMBER_ID=t.id) as empowerEndTime");
+ queryWrapper.eq(Member::getType,Constants.ZERO);
queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
.like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
.like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
@@ -455,6 +499,32 @@
return PageData.from(memberIPage);
}
+
+ @Override
+ public PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap) {
+
+
+ IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(Member.class)
+ .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
+ .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0) as visitsCount")
+ .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE limit 1) as visitsLastDate");
+
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
+ .eq(Member::getStatus,Constants.Status.ENABLE)
+ .orderByDesc(Member::getCreateDate);
+
+
+ IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ return PageData.from(memberIPage);
+
+ }
+
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index c5d18cc..0a7c27b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -1,15 +1,23 @@
package com.doumee.service.business.impl;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.TrainTimeMapper;
+import com.doumee.dao.business.join.TrainTimeJoinMapper;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.TrainTime;
+import com.doumee.dao.business.model.Visits;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.TrainTimeService;
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.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +34,9 @@
@Autowired
private TrainTimeMapper trainTimeMapper;
+ @Autowired
+ private TrainTimeJoinMapper trainTimeJoinMapper;
+
@@ -89,54 +100,26 @@
@Override
public PageData<TrainTime> findPage(PageWrap<TrainTime> pageWrap) {
IPage<TrainTime> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<TrainTime> queryWrapper = new QueryWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(TrainTime::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(TrainTime::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(TrainTime::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(TrainTime::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEdirot() != null) {
- queryWrapper.lambda().eq(TrainTime::getEdirot, pageWrap.getModel().getEdirot());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(TrainTime::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(TrainTime::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(TrainTime::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(TrainTime::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(TrainTime::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getStartTime() != null) {
- queryWrapper.lambda().eq(TrainTime::getStartTime, pageWrap.getModel().getStartTime());
- }
- if (pageWrap.getModel().getEndTime() != null) {
- queryWrapper.lambda().eq(TrainTime::getEndTime, pageWrap.getModel().getEndTime());
- }
- if (pageWrap.getModel().getImportStatus() != null) {
- queryWrapper.lambda().eq(TrainTime::getImportStatus, pageWrap.getModel().getImportStatus());
- }
- if (pageWrap.getModel().getImportInfo() != null) {
- queryWrapper.lambda().eq(TrainTime::getImportInfo, pageWrap.getModel().getImportInfo());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(trainTimeMapper.selectPage(page, queryWrapper));
+ MPJLambdaWrapper<TrainTime> queryWrapper = new MPJLambdaWrapper<>();
+
+ queryWrapper.leftJoin(Member.class,Member::getId,TrainTime::getMemberId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,TrainTime::getCreator);
+
+ queryWrapper.selectAll(TrainTime.class);
+ queryWrapper.selectAs(Member::getName,TrainTime::getName);
+ queryWrapper.selectAs(Member::getPhone,TrainTime::getPhone);
+ queryWrapper.selectAs(Member::getIdcardNo,TrainTime::getIdcardNo);
+ queryWrapper.selectAs(Company::getName,TrainTime::getCompanyName);
+ queryWrapper.selectAs(SystemUser::getUsername,TrainTime::getCreateName);
+
+ queryWrapper.eq(TrainTime::getIsdeleted, Constants.ZERO);
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getName())
+ .or().like(Member::getName,pageWrap.getModel().getName()));
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
+ queryWrapper.orderByDesc(TrainTime::getCreateDate);
+ IPage<TrainTime> result = trainTimeJoinMapper.selectJoinPage(page, TrainTime.class,queryWrapper);
+ return PageData.from(result);
}
@Override
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index c3f0a31..cd6e234 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -17,19 +17,20 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.DeviceRoleMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.ProblemLogMapper;
import com.doumee.dao.business.VisitsMapper;
-import com.doumee.dao.business.model.DeviceRole;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.ProblemLog;
-import com.doumee.dao.business.model.Visits;
+import com.doumee.dao.business.join.DeviceJoinMapper;
+import com.doumee.dao.business.join.VisitsJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.VisitsService;
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.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -37,10 +38,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.DigestUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* 璁垮鐢宠淇℃伅琛⊿ervice瀹炵幇
@@ -58,9 +56,15 @@
private ProblemLogMapper problemLogMapper ;
@Autowired
private MemberMapper memberMapper ;
+ @Autowired
+ private VisitsJoinMapper visitsJoinMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private DeviceJoinMapper deviceJoinMapper;
+
+
@Override
public Integer create(Visits visits) {
visitsMapper.insert(visits);
@@ -445,7 +449,36 @@
@Override
public Visits findById(Integer id) {
- return visitsMapper.selectById(id);
+
+ MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Visits.class);
+ queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
+ queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
+ queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+
+ queryWrapper.eq(Visits::getId,id);
+ Visits result = visitsJoinMapper.selectJoinOne(Visits.class,queryWrapper);
+
+ if(result!=null){
+ if(StringUtils.isNotBlank(result.getDoors())){
+ String[] doorList=result.getDoors().split(",");
+ MPJLambdaWrapper<Device> deviceQuery = new MPJLambdaWrapper<>();
+ deviceQuery.in(Device::getId,doorList);
+ List<Device> deviceList= deviceJoinMapper.selectList(deviceQuery);
+ result.setDeviceList(deviceList);
+ }
+ }
+
+ MPJLambdaWrapper<Visits> visitQuery = new MPJLambdaWrapper<>();
+ visitQuery.selectAll(Visits.class);
+ visitQuery.eq(Visits::getParentId,result.getId());
+ visitQuery.isNotNull(Visits::getParentId);
+ visitQuery.eq(Visits::getIsdeleted,Constants.ZERO);
+ List<Visits> visitsList = visitsJoinMapper.selectList(visitQuery);
+ visitsList.add(0,result);
+ result.setVisitsList(visitsList);
+ return result;
}
@Override
@@ -463,147 +496,25 @@
@Override
public PageData<Visits> findPage(PageWrap<Visits> pageWrap) {
IPage<Visits> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Visits> queryWrapper = new QueryWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Visits::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Visits::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Visits::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Visits::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(Visits::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Visits::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Visits::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Visits::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Visits::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(Visits::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(Visits::getCompanyId, pageWrap.getModel().getCompanyId());
- }
- if (pageWrap.getModel().getFaceImg() != null) {
- queryWrapper.lambda().eq(Visits::getFaceImg, pageWrap.getModel().getFaceImg());
- }
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(Visits::getImgurl, pageWrap.getModel().getImgurl());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Visits::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Visits::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getBirthday() != null) {
- queryWrapper.lambda().ge(Visits::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
- queryWrapper.lambda().le(Visits::getBirthday, Utils.Date.getEnd(pageWrap.getModel().getBirthday()));
- }
- if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().eq(Visits::getPhone, pageWrap.getModel().getPhone());
- }
- if (pageWrap.getModel().getCompanyName() != null) {
- queryWrapper.lambda().eq(Visits::getCompanyName, pageWrap.getModel().getCompanyName());
- }
- if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().eq(Visits::getIdcardNo, pageWrap.getModel().getIdcardNo());
- }
- if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(Visits::getCode, pageWrap.getModel().getCode());
- }
- if (pageWrap.getModel().getClasses() != null) {
- queryWrapper.lambda().eq(Visits::getClasses, pageWrap.getModel().getClasses());
- }
- if (pageWrap.getModel().getMemberNum() != null) {
- queryWrapper.lambda().eq(Visits::getMemberNum, pageWrap.getModel().getMemberNum());
- }
- if (pageWrap.getModel().getStarttime() != null) {
- queryWrapper.lambda().ge(Visits::getStarttime, Utils.Date.getStart(pageWrap.getModel().getStarttime()));
- queryWrapper.lambda().le(Visits::getStarttime, Utils.Date.getEnd(pageWrap.getModel().getStarttime()));
- }
- if (pageWrap.getModel().getEndtime() != null) {
- queryWrapper.lambda().ge(Visits::getEndtime, Utils.Date.getStart(pageWrap.getModel().getEndtime()));
- queryWrapper.lambda().le(Visits::getEndtime, Utils.Date.getEnd(pageWrap.getModel().getEndtime()));
- }
- if (pageWrap.getModel().getReason() != null) {
- queryWrapper.lambda().eq(Visits::getReason, pageWrap.getModel().getReason());
- }
- if (pageWrap.getModel().getDoorSelect() != null) {
- queryWrapper.lambda().eq(Visits::getDoorSelect, pageWrap.getModel().getDoorSelect());
- }
- if (pageWrap.getModel().getDoors() != null) {
- queryWrapper.lambda().eq(Visits::getDoors, pageWrap.getModel().getDoors());
- }
- if (pageWrap.getModel().getReceptMemberId() != null) {
- queryWrapper.lambda().eq(Visits::getReceptMemberId, pageWrap.getModel().getReceptMemberId());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Visits::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getCheckorId() != null) {
- queryWrapper.lambda().eq(Visits::getCheckorId, pageWrap.getModel().getCheckorId());
- }
- if (pageWrap.getModel().getCheckDate() != null) {
- queryWrapper.lambda().ge(Visits::getCheckDate, Utils.Date.getStart(pageWrap.getModel().getCheckDate()));
- queryWrapper.lambda().le(Visits::getCheckDate, Utils.Date.getEnd(pageWrap.getModel().getCheckDate()));
- }
- if (pageWrap.getModel().getCheckInfo() != null) {
- queryWrapper.lambda().eq(Visits::getCheckInfo, pageWrap.getModel().getCheckInfo());
- }
- if (pageWrap.getModel().getEndCheckorId() != null) {
- queryWrapper.lambda().eq(Visits::getEndCheckorId, pageWrap.getModel().getEndCheckorId());
- }
- if (pageWrap.getModel().getEndCheckDate() != null) {
- queryWrapper.lambda().ge(Visits::getEndCheckDate, Utils.Date.getStart(pageWrap.getModel().getEndCheckDate()));
- queryWrapper.lambda().le(Visits::getEndCheckDate, Utils.Date.getEnd(pageWrap.getModel().getEndCheckDate()));
- }
- if (pageWrap.getModel().getEndCheckInfo() != null) {
- queryWrapper.lambda().eq(Visits::getEndCheckInfo, pageWrap.getModel().getEndCheckInfo());
- }
- if (pageWrap.getModel().getIdcardType() != null) {
- queryWrapper.lambda().eq(Visits::getIdcardType, pageWrap.getModel().getIdcardType());
- }
- if (pageWrap.getModel().getCarNos() != null) {
- queryWrapper.lambda().eq(Visits::getCarNos, pageWrap.getModel().getCarNos());
- }
- if (pageWrap.getModel().getParentId() != null) {
- queryWrapper.lambda().eq(Visits::getParentId, pageWrap.getModel().getParentId());
- }
- if (pageWrap.getModel().getUserAnswerId() != null) {
- queryWrapper.lambda().eq(Visits::getUserAnswerId, pageWrap.getModel().getUserAnswerId());
- }
- if (pageWrap.getModel().getHkId() != null) {
- queryWrapper.lambda().eq(Visits::getHkId, pageWrap.getModel().getHkId());
- }
- if (pageWrap.getModel().getHkStatus() != null) {
- queryWrapper.lambda().eq(Visits::getHkStatus, pageWrap.getModel().getHkStatus());
- }
- if (pageWrap.getModel().getHkDate() != null) {
- queryWrapper.lambda().ge(Visits::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
- queryWrapper.lambda().le(Visits::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
- }
- if (pageWrap.getModel().getErpId() != null) {
- queryWrapper.lambda().eq(Visits::getErpId, pageWrap.getModel().getErpId());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(visitsMapper.selectPage(page, queryWrapper));
+ MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
+
+ queryWrapper.selectAll(Visits.class);
+ queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
+ queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
+ queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+
+ queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Visits::getType,pageWrap.getModel().getType());
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()),ms->ms.like(Visits::getPhone,pageWrap.getModel().getName())
+ .or().like(Visits::getPhone,pageWrap.getModel().getName()))
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Visits::getIdcardNo,StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()))
+ .eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Visits::getCompanyName,pageWrap.getModel().getCompanyName())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Visits::getStatus,pageWrap.getModel().getStatus());
+ queryWrapper.isNull(Visits::getParentId);
+ queryWrapper.orderByDesc(Visits::getCreateDate);
+ IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);
+ return PageData.from(result);
}
@Override
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index ee3c8b9..9429df2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -1,23 +1,56 @@
package com.doumee.service.business.impl.erp;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.Jwt.JwtPayLoad;
+import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
import com.doumee.core.haikang.model.param.request.DoorsListRequest;
-import com.doumee.core.haikang.model.param.request.ParkListRequest;
import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.openapi.request.*;
import com.doumee.core.model.openapi.request.erp.OrgListRequest;
import com.doumee.core.model.openapi.request.erp.UserInfoRequest;
import com.doumee.core.model.openapi.request.erp.UserListRequest;
+import com.doumee.core.model.openapi.response.*;
import com.doumee.core.model.openapi.response.erp.OrgListRespone;
-import com.doumee.service.business.ERPSyncService;
-import com.doumee.service.business.HkSyncService;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DESUtil;
+import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.redis.RedisUtil;
+import com.doumee.dao.admin.response.MemberInfoDTO;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.join.CarEventJoinMapper;
+import com.doumee.dao.business.join.DeviceEventJoinMapper;
+import com.doumee.dao.business.join.VisitEventJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.web.reqeust.CheckVisitedDTO;
+import com.doumee.dao.web.response.MemberVO;
+import com.doumee.service.business.*;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 璁惧淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +59,49 @@
*/
@Service
public class ErpSyncServiceImpl implements ERPSyncService {
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+ @Autowired
+ private DeviceRoleMapper deviceRoleMapper;
+
+ @Autowired
+ private DeviceMapper deviceMapper;
+
+ @Autowired
+ private ParksMapper parksMapper;
+
+ @Autowired
+ private VisitEventMapper visitEventMapper;
+
+
+ @Autowired
+ private VisitEventJoinMapper visitEventJoinMapper;
+
+ @Autowired
+ private DeviceEventJoinMapper deviceEventJoinMapper;
+
+ @Autowired
+ private CarEventJoinMapper carEventJoinMapper;
+
+ @Autowired
+ private CompanyMapper companyMapper;
+
+ @Autowired
+ private MemberMapper memberMapper;
+
+ @Autowired
+ private MemberRoleMapper memberRoleMapper;
+
+ @Autowired
+ private MemberCardMapper memberCardMapper;
+
+ @Autowired
+ private InterfaceLogService interfaceLogService;
/**
* 鍚屾ERP缁勭粐淇℃伅
@@ -58,4 +134,422 @@
public String syncUserInfo(UserInfoRequest param){
return null;
}
+
+
+ @Override
+ public AccessTokenResponse createERPToken(String accessKey, String accessSecret){
+ AccessTokenResponse result = new AccessTokenResponse();
+ try{
+ String erpAccessKey = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_KEY).getCode();
+ String erpAccessSecret = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_SECRET).getCode();
+ if(!accessKey.equals(erpAccessKey)||!erpAccessSecret.equals(accessSecret)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绉橀挜鍖归厤澶辫触");
+ }
+ JwtPayLoad payLoad = new JwtPayLoad(erpAccessKey+"-"+erpAccessSecret);
+ String token = JwtTokenUtil.generateToken(payLoad);
+ RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,token,Constants.RedisKeys.EXPIRE_TIME);
+ result.setToken(token);
+ result.setExpireTime(Constants.RedisKeys.EXPIRE_TIME);
+ }catch (Exception e){
+
+ }finally {
+ Map<String,String> param = new HashMap<>();
+ param.put("accessKey",accessKey);
+ param.put("accessSecret",accessSecret);
+ saveInterfaceLog(param,"/visitBiz/accesstoken",JSONObject.toJSONString(result),Constants.ZERO);
+ }
+
+
+ return result;
+ }
+
+ /**
+ * 闂ㄧ缁勫叏閲忔帴鍙�
+ * @param param
+ * @return
+ */
+ @Override
+ public List<RoleListResponse> erpQueryDeviceList(RoleListRequest param){
+ List<RoleListResponse> result = new ArrayList<>();
+ try{
+ List<DeviceRole> deviceRoleList = this.deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+ .eq(DeviceRole::getIsdeleted,Constants.ZERO)
+ .eq(!Objects.isNull(param.getId()),DeviceRole::getId,param.getId())
+ .like(StringUtils.isNotBlank(param.getName()),DeviceRole::getName,param.getName())
+ .orderByAsc(DeviceRole::getCreateDate)
+ );
+ List<String> roleIds = new ArrayList<String>();
+ if(CollectionUtils.isNotEmpty(deviceRoleList)){
+ for (DeviceRole deviceRole:deviceRoleList) {
+ if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
+ List<String> doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
+ roleIds.addAll(doorList);
+ }
+ }
+ if(CollectionUtils.isNotEmpty(roleIds)){
+ List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,roleIds));
+ for (DeviceRole deviceRole:deviceRoleList) {
+ RoleListResponse roleListResponse = new RoleListResponse();
+ BeanUtils.copyProperties(deviceRole,roleListResponse);
+ if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
+ List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
+ List<String> doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
+ List<Device> roleDeviceList = deviceList.stream().filter(m-> doorList.contains(m.getId().toString())).collect(Collectors.toList());
+ for (Device device:roleDeviceList) {
+ DeviceListResponse deviceListResponse = new DeviceListResponse();
+ BeanUtils.copyProperties(device,deviceListResponse);
+ DeviceListResponseList.add(deviceListResponse);
+ }
+ roleListResponse.setDeviceList(DeviceListResponseList);
+ }
+ result.add(roleListResponse);
+ }
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ saveInterfaceLog(param,"/visitBiz/resource/role/list",JSONObject.toJSONString(result),Constants.ZERO);
+ }
+ return result;
+ }
+
+
+
+
+ /**
+ * 鍋滆溅鍦哄叏閲忎俊鎭帴鍙�
+ * @param param
+ * @return
+ */
+ @Override
+ public List<ParkListResponse> parkList(ParkListRequest param){
+ List<ParkListResponse> result = new ArrayList<>();
+ try{
+ List<Parks> parksList = this.parksMapper.selectList(new QueryWrapper<Parks>().lambda()
+ .eq(Parks::getIsdeleted,Constants.ZERO)
+ .eq(!Objects.isNull(param.getId()),Parks::getId,param.getId())
+ .like(StringUtils.isNotBlank(param.getName()),Parks::getName,param.getName())
+ );
+ if(CollectionUtils.isNotEmpty(parksList)){
+ for (Parks parks:parksList) {
+ ParkListResponse parkListResponse = new ParkListResponse();
+ BeanUtils.copyProperties(parks,parkListResponse);
+ result.add(parkListResponse);
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ saveInterfaceLog(param,"/visitBiz/resource/park/list",JSONObject.toJSONString(result),Constants.ZERO);
+ }
+ return result;
+ }
+
+ /**
+ * 璁垮鍑哄叆浜嬩欢鍚屾鎺ュ彛
+ * @param param
+ * @return
+ */
+ @Override
+ public PageData<VisitEventListResponse> visitListPage(PageWrap<VisitListRequest> param) {
+ PageData<VisitEventListResponse> result = new PageData<>();
+ try{
+ VisitListRequest visitListRequest = param.getModel();
+ IPage<VisitEvent> page = new Page<>(param.getPage(), param.getCapacity());
+ MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(visitListRequest);
+
+ queryWrapper.selectAll(VisitEvent.class);
+ queryWrapper.selectAs(Visits::getName, VisitEventListResponse::getVisitorName);
+ queryWrapper.leftJoin(Visits.class,Visits::getId,VisitEvent::getVisitorId);
+
+ if(!Objects.isNull(visitListRequest)){
+ queryWrapper.eq(!Objects.isNull(visitListRequest.getEventId()),VisitEvent::getEventId, visitListRequest.getEventId());
+ queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorName()),Visits::getName, visitListRequest.getVisitorName());
+ queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getIdNo()),VisitEvent::getIdNo, visitListRequest.getIdNo());
+ queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonId()),VisitEvent::getBeVisitedPersonId, visitListRequest.getBeVisitedPersonId());
+ queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonOrgId()),VisitEvent::getBeVisitedPersonOrgId, visitListRequest.getBeVisitedPersonOrgId());
+ queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorWorkUint()),VisitEvent::getVisitorWorkUint, visitListRequest.getVisitorWorkUint());
+ queryWrapper.ge(StringUtils.isNotBlank(visitListRequest.getInStartTime()),VisitEvent::getStartTime, visitListRequest.getInStartTime());
+ queryWrapper.le(StringUtils.isNotBlank(visitListRequest.getInEndTime()),VisitEvent::getStartTime, visitListRequest.getInEndTime());
+ queryWrapper.ge(StringUtils.isNotBlank(visitListRequest.getOutStartTime()),VisitEvent::getEndTime, visitListRequest.getOutStartTime());
+ queryWrapper.le(StringUtils.isNotBlank(visitListRequest.getOutEndTime()),VisitEvent::getEndTime, visitListRequest.getOutEndTime());
+
+ for(PageWrap.SortData sortData: param.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ }
+ IPage<VisitEventListResponse> pageData = visitEventJoinMapper.selectJoinPage(page, VisitEventListResponse.class,queryWrapper);
+ result = PageData.from(pageData);
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ saveInterfaceLog(param,"/visitBiz/resource/visit/list",JSONObject.toJSONString(result),Constants.ZERO);
+ }
+ return result;
+ }
+
+
+ @Override
+ public PageData<DoorEventListResponse> doorEventListPage(PageWrap<DoorEventListRequest> param) {
+ PageData<DoorEventListResponse> result = new PageData<>();
+ try{
+ DoorEventListRequest doorEventListRequest = param.getModel();
+ IPage<DeviceEvent> page = new Page<>(param.getPage(), param.getCapacity());
+ MPJLambdaWrapper<DeviceEvent> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(doorEventListRequest);
+ queryWrapper.selectAs(DeviceEvent::getEventId,DoorEventListResponse::getEventId);
+ queryWrapper.selectAs(DeviceEvent::getEventType,DoorEventListResponse::getEventType);
+ queryWrapper.selectAs(DeviceEvent::getSex,DoorEventListResponse::getSex);
+ queryWrapper.selectAs(DeviceEvent::getSrcName,DoorEventListResponse::getSrcName);
+ queryWrapper.selectAs(DeviceEvent::getSrcType,DoorEventListResponse::getSrcType);
+ queryWrapper.selectAs(DeviceEvent::getIdcardDecode,DoorEventListResponse::getIdcardNo);
+ queryWrapper.selectAs(DeviceEvent::getName,DoorEventListResponse::getName);
+ queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
+ queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
+ queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
+ queryWrapper.selectAs(DeviceEvent::getCreateDate,DoorEventListResponse::getCreateTime);
+ queryWrapper.selectAs(Member::getPhone,DoorEventListResponse::getPhone);
+ queryWrapper.selectAs(Member::getErpId,DoorEventListResponse::getUserId);
+ queryWrapper.selectAs(Member::getCompanyId,DoorEventListResponse::getOrgId);
+ queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo);
+
+ if(!Objects.isNull(doorEventListRequest)){
+ queryWrapper.eq(!Objects.isNull(doorEventListRequest.getEventId()),DeviceEvent::getEventId, doorEventListRequest.getEventId());
+ queryWrapper.like(StringUtils.isNotBlank(doorEventListRequest.getName()),DeviceEvent::getName, doorEventListRequest.getName());
+ if(StringUtils.isNotBlank(doorEventListRequest.getIdNo())){
+ //杩涜鍔犲瘑
+ String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,doorEventListRequest.getIdNo());
+ queryWrapper.eq(DeviceEvent::getIdNum, encryptIdNo);
+ }
+ queryWrapper.ge(StringUtils.isNotBlank(doorEventListRequest.getStartTime()),DeviceEvent::getHappenTime, doorEventListRequest.getStartTime());
+ queryWrapper.le(StringUtils.isNotBlank(doorEventListRequest.getEndTime()),DeviceEvent::getHappenTime, doorEventListRequest.getEndTime());
+ for(PageWrap.SortData sortData: param.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ }
+
+ IPage<DoorEventListResponse> pageData = deviceEventJoinMapper.selectJoinPage(page, DoorEventListResponse.class,queryWrapper);
+ result = PageData.from(pageData);
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ saveInterfaceLog(param,"/visitBiz/resource/doorEvent/list",JSONObject.toJSONString(result),Constants.ZERO);
+ }
+ return result;
+ }
+
+
+ @Override
+ public PageData<CarEventListResponse> carEventList(PageWrap<CarEventListRequest> param) {
+ PageData<CarEventListResponse> result = new PageData<>();
+ try{
+ CarEventListRequest carEventListRequest = param.getModel();
+ IPage<CarEvent> page = new Page<>(param.getPage(), param.getCapacity());
+ MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(carEventListRequest);
+ queryWrapper.selectAs(CarEvent::getEventId,CarEventListResponse::getEventId);
+ queryWrapper.selectAs(CarEvent::getEventType,CarEventListResponse::getEventType);
+ queryWrapper.selectAs(CarEvent::getInoutType,CarEventListResponse::getEventType);
+ queryWrapper.selectAs(CarEvent::getAlarmCar,CarEventListResponse::getAlarmCar);
+ queryWrapper.selectAs(CarEvent::getCarAttributeName,CarEventListResponse::getCarAttributeName);
+ queryWrapper.selectAs(CarEvent::getCardNo,CarEventListResponse::getCardNo);
+ queryWrapper.selectAs(CarEvent::getEventCmd,CarEventListResponse::getEventCmd);
+ queryWrapper.selectAs(CarEvent::getGateIndex,CarEventListResponse::getGateIndex);
+ queryWrapper.selectAs(CarEvent::getGateName,CarEventListResponse::getGateName);
+ queryWrapper.selectAs(CarEvent::getMainLogo,CarEventListResponse::getMainLogo);
+ queryWrapper.selectAs(CarEvent::getParkIndex,CarEventListResponse::getParkId);
+ queryWrapper.selectAs(CarEvent::getParkName,CarEventListResponse::getParkName);
+ queryWrapper.selectAs(CarEvent::getPlatePicUrl,CarEventListResponse::getPlatePicUrl);
+ queryWrapper.selectAs(CarEvent::getVehiclePicUrl,CarEventListResponse::getVehiclePicUrl);
+ queryWrapper.selectAs(CarEvent::getPlateNos,CarEventListResponse::getPlateNo);
+ queryWrapper.selectAs(CarEvent::getPlateColor,CarEventListResponse::getPlateColor);
+ queryWrapper.selectAs(CarEvent::getRoadwayName,CarEventListResponse::getRoadwayName);
+ queryWrapper.selectAs(CarEvent::getRoadwayType,CarEventListResponse::getRoadwayType);
+ queryWrapper.selectAs(CarEvent::getSubLogo,CarEventListResponse::getSubLogo);
+ queryWrapper.selectAs(CarEvent::getSubModel,CarEventListResponse::getSubModel);
+
+ if(!Objects.isNull(carEventListRequest)){
+ queryWrapper.eq(!Objects.isNull(carEventListRequest.getEventId()),CarEvent::getEventId, carEventListRequest.getEventId());
+ queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getParkId()),CarEvent::getParkIndex, carEventListRequest.getParkId());
+ queryWrapper.like(StringUtils.isNotBlank(carEventListRequest.getParkName()),CarEvent::getParkName, carEventListRequest.getParkName());
+ queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getPlateNo()),CarEvent::getPlateNos, carEventListRequest.getPlateNo());
+ queryWrapper.ge(StringUtils.isNotBlank(carEventListRequest.getStartTime()),CarEvent::getHappenTime, carEventListRequest.getStartTime());
+ queryWrapper.le(StringUtils.isNotBlank(carEventListRequest.getEndTime()),CarEvent::getHappenTime, carEventListRequest.getEndTime());
+ for(PageWrap.SortData sortData: param.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ }
+ IPage<CarEventListResponse> pageData = carEventJoinMapper.selectJoinPage(page, CarEventListResponse.class,queryWrapper);
+ result = PageData.from(pageData);
+ result.getRecords().forEach(i->{
+ if(i.getPlatePicUrl().startsWith(HKConstants.IMG_INDEX)){
+ i.setPlatePicUrl(null);
+ }
+ if(i.getVehiclePicUrl().startsWith(HKConstants.IMG_INDEX)){
+ i.setVehiclePicUrl(null);
+ }
+ });
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ saveInterfaceLog(param,"/visitBiz/resource/carEventList",JSONObject.toJSONString(result),Constants.ZERO);
+ }
+
+ return result;
+ }
+
+
+
+
+ @Override
+ public void orgUpdate(OrgUpdateRequest param){
+ try{
+ if(Objects.isNull(param)
+ ||Objects.isNull(param.getId())
+ ||StringUtils.isBlank(param.getName())
+ ||StringUtils.isBlank(param.getLinkName())
+ ||StringUtils.isBlank(param.getLinkPhone())
+ ||Objects.isNull(param.getEditDate())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getId()).last("limit 1"));
+ if(Objects.isNull(company)){
+ company = new Company();
+ BeanUtils.copyProperties(param,company);
+ company.setId(null);
+ company.setCreateDate(new Date());
+ company.setHkStatus(Constants.ZERO);
+ company.setErpStatus(Constants.ONE);
+ company.setErpDate(new Date());
+ company.setErpId(param.getId());
+ company.setFsStatus(Constants.ZERO);
+ company.setType(Constants.ONE);
+ companyMapper.insert(company);
+ //TODO 娴峰悍鏁版嵁鍒涘缓
+ }else{
+ BeanUtils.copyProperties(param,company);
+ company.setEditDate(new Date());
+ company.setErpDate(new Date());
+ companyMapper.updateById(company);
+ //TODO 娴峰悍鏁版嵁鏇存柊
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ saveInterfaceLog(param,"/visitBiz/resource/orgUpdate",null,Constants.ZERO);
+ }
+ }
+
+
+
+ @Override
+ public void userUpdate(UserUpdateRequest param){
+ try{
+ if(Objects.isNull(param)
+ ||Objects.isNull(param.getId())
+ ||StringUtils.isBlank(param.getName())
+ ||StringUtils.isBlank(param.getIdNo())
+ ||Objects.isNull(param.getIdType())
+ ||Objects.isNull(param.getSex())
+ ||Objects.isNull(param.getOrgId())
+ ||StringUtils.isNotBlank(param.getFaceImg())
+ ||StringUtils.isNotBlank(param.getCode())
+ ||StringUtils.isNotBlank(param.getPhone())
+ ||Objects.isNull(param.getEditDate())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
+ if(Objects.isNull(member)){
+ member = new Member();
+ BeanUtils.copyProperties(param,member);
+ member.setCreateDate(new Date());
+ member.setHkStatus(Constants.ZERO);
+ member.setErpStatus(Constants.ONE);
+ member.setErpDate(new Date());
+ member.setErpId(param.getId());
+ member.setFsStatus(Constants.ZERO);
+ member.setType(Constants.memberType.internal);
+ String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
+ member.setIdcardNo(encryptIdNo);
+ member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
+ member.setCompanyId(param.getOrgId());
+ memberMapper.insert(member);
+
+ //TODO 娴峰悍鏁版嵁鍒涘缓
+ }else{
+ BeanUtils.copyProperties(param,member);
+ String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
+ member.setIdcardNo(encryptIdNo);
+ member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
+ member.setCompanyId(param.getOrgId());
+ member.setEditDate(new Date());
+ member.setErpDate(new Date());
+ memberMapper.updateById(member);
+ //鍒犻櫎鐢ㄦ埛鍗＄墖鏁版嵁 浜哄憳瑙掕壊鍏宠仈
+ memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
+ memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+ //TODO 娴峰悍鏁版嵁鏇存柊
+ }
+ //娣诲姞浜哄憳瑙掑叧鑱旀暟鎹�
+ if(!Objects.isNull(param.getRoleIds())&¶m.getRoleIds().length>Constants.ZERO){
+ //鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
+ List<MemberRole> memberRoleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getId,param.getRoleIds()));
+ List<Integer> roleIds = Arrays.asList(param.getRoleIds());
+
+// List<MemberRole> memberRoleList = new ArrayList<>();
+//
+// for (Integer id:roleIds) {
+//
+// }
+
+
+
+
+ }
+
+
+
+
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ saveInterfaceLog(param,"/visitBiz/resource/userUpdate",null,Constants.ZERO);
+ }
+ }
+
+
+
+
+
+ private void saveInterfaceLog(Object param, String path,String result,Integer type) {
+ InterfaceLog interfaceLog=new InterfaceLog();
+ interfaceLog.setType(type);
+ interfaceLog.setCreateDate(new Date());
+ interfaceLog.setIsdeleted(Constants.ZERO);
+ if(param!=null){
+ interfaceLog.setRequest(JSONObject.toJSONString(param));
+ }
+ interfaceLog.setPlat(Constants.ONE);
+ interfaceLog.setRepose(result);
+ interfaceLog.setName(path);
+ interfaceLog.setUrl(path);
+ interfaceLogService.create(interfaceLog);
+ }
+
}
diff --git a/server/openapi/src/main/java/com/doumee/api/web/ApiController.java b/server/openapi/src/main/java/com/doumee/api/web/ApiController.java
index b4b2a20..ecceb79 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/openapi/src/main/java/com/doumee/api/web/ApiController.java
@@ -1,5 +1,6 @@
package com.doumee.api.web;
+import com.doumee.config.Jwt.JwtTokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -25,4 +26,10 @@
return request;
}
+ protected String getToken() {
+ Object obj = this.getRequest().getAttribute(JwtTokenUtil.HEADER_KEY);
+ return obj != null ? obj.toString() : null;
+ }
+
+
}
diff --git a/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java b/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
index a6d2a65..c0c9384 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
+++ b/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
@@ -1,17 +1,30 @@
package com.doumee.api.web;
+import com.doumee.config.Jwt.JwtPayLoad;
+import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.config.annotation.ErpLoginRequired;
+import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.openapi.request.*;
import com.doumee.core.model.openapi.response.*;
+import com.doumee.core.utils.Constants;
+import com.doumee.service.business.DeviceRoleService;
+import com.doumee.service.business.DeviceService;
+import com.doumee.service.business.ERPSyncService;
+import com.doumee.service.business.MemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpRequest;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
@@ -24,9 +37,13 @@
@Api(tags = "1銆併�愯瀹㈢銆戞暟鎹祫婧愭帴鍙ｏ紙鍚慐RP绔彁渚涙垨鎻愪氦鏁版嵁淇℃伅锛�")
@RestController
-@RequestMapping("/visitbiz/resource")
+@RequestMapping("/visitbiz")
@Slf4j
public class BizResourceController extends ApiController{
+
+ @Autowired
+ private ERPSyncService erpSyncService;
+
@ApiOperation(value = "璋冪敤鍑嵁鑾峰彇鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝鍚慐RP鎻愪緵缁熸帴鍙ｈ皟鐢ㄥ嚟璇�")
@GetMapping("/accesstoken")
@@ -34,16 +51,19 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "accessKey", value = "璁块棶key锛岀敱璁垮绔彁渚�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "accessSecret", value = "璁块棶绉橀挜锛岀敱璁垮绔彁渚�", required = true)
})
- public ApiResponse<AccessTokenResponse> roleList(@RequestParam String accessKey, @RequestParam String accessSecret) {
- return ApiResponse.success(new AccessTokenResponse());
+ public ApiResponse<AccessTokenResponse> accesstoken(@RequestParam String accessKey, @RequestParam String accessSecret) {
+ return ApiResponse.success(erpSyncService.createERPToken(accessKey,accessSecret));
}
+
+ @ErpLoginRequired
@ApiOperation(value = "闂ㄧ缁勫叏閲忔帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔悓姝ヨ幏鍙栭棬绂佺粍鍏ㄩ噺淇℃伅")
@PostMapping("/resource/role/list")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse<List<RoleListResponse>> roleList(@RequestBody RoleListRequest param) {
- return ApiResponse.success(new ArrayList<RoleListResponse>());
+ param.setToken(this.getToken());
+ return ApiResponse.success(erpSyncService.erpQueryDeviceList(param));
}
@ApiOperation(value = "鍋滆溅鍦哄叏閲忎俊鎭帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔悓姝ュ叏閮ㄥ仠杞﹀満鏁版嵁")
@@ -51,8 +71,9 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
- public ApiResponse<ParkListResponse> parkList(@RequestBody ParkListRequest param) {
- return ApiResponse.success(new ParkListResponse());
+ public ApiResponse<List<ParkListResponse>> parkList(@RequestBody ParkListRequest param) {
+ param.setToken(this.getToken());
+ return ApiResponse.success(erpSyncService.parkList(param));
}
@ApiOperation(value = "璁垮鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栬瀹㈠嚭鍏ヨ褰曚俊鎭�")
@@ -61,40 +82,52 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse<PageData<VisitEventListResponse>> visitList (@RequestBody PageWrap<VisitListRequest> pageWrap) {
- return ApiResponse.success(null);
+ pageWrap.getModel().setToken(this.getToken());
+ return ApiResponse.success(erpSyncService.visitListPage(pageWrap));
}
+
@ApiOperation(value = "闂ㄧ鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栭棬绂佸嚭鍏ヨ褰曚俊鎭�")
@PostMapping("/resource/doorEvent/list")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse<PageData<DoorEventListResponse>> doorEventList (@RequestBody PageWrap<DoorEventListRequest> pageWrap) {
- return ApiResponse.success(null);
+ pageWrap.getModel().setToken(this.getToken());
+ return ApiResponse.success(erpSyncService.doorEventListPage(pageWrap));
}
+
@ApiOperation(value = "杞﹁締鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栬溅杈嗗嚭鍏ヨ褰曚俊鎭�")
@PostMapping("/resource/carvisit/list")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
- public ApiResponse<PageData<CarEventListResponse>> carEventList (@RequestBody PageWrap<CarEventListResponse> pageWrap) {
- return ApiResponse.success(null);
+ public ApiResponse<PageData<CarEventListResponse>> carEventList (@RequestBody PageWrap<CarEventListRequest> pageWrap) {
+ pageWrap.getModel().setToken(this.getToken());
+ return ApiResponse.success(erpSyncService.carEventList(pageWrap));
}
+
@ApiOperation(value = "缁勭粐鍙樺寲鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝瀹屾垚璁垮绔粍缁囦俊鎭悓姝ワ紝璇ユ帴鍙ｆ敮鎸佸崟涓粍缁囨柊澧炪�佹洿鏂般�佸垹闄ら渶姹�")
@PostMapping("/event/org/update")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse orgUpdate(@RequestBody OrgUpdateRequest param) {
+ param.setToken(this.getToken());
+ erpSyncService.orgUpdate(param);
return ApiResponse.success(null);
}
+
@ApiOperation(value = "浜哄憳鍙樺寲鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝瀹屾垚璁垮绔汉鍛樹俊鎭悓姝ワ紝璇ユ帴鍙ｆ敮鎸佸崟涓汉鍛樻柊澧炪�佹洿鏂般�佸垹闄ら渶姹�")
@PostMapping("/event/user/update")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse userUpdate(@RequestBody UserUpdateRequest param) {
+ param.setToken(this.getToken());
+ erpSyncService.userUpdate(param);
return ApiResponse.success(null);
}
+
@ApiOperation(value = "浜哄憳闂ㄧ缁勬巿鏉冩帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝璁垮绔汉鍛樺悓姝ラ棬绂佺粍鎺堟潈淇℃伅锛岃鎺ュ彛鏀寔浜哄憳闂ㄧ缁勬巿鏉冩柊澧炪�佹洿鏂般�佹竻绌洪渶姹傘��")
@PostMapping("/event/role/userAuthor")
@ApiImplicitParams({
@@ -103,6 +136,7 @@
public ApiResponse roleUserAuthor(@RequestBody UserAuthorRequest param) {
return ApiResponse.success(null);
}
+
@ApiOperation(value = "杞﹁締鎺堟潈鍋滆溅鍦烘帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝璁垮绔悓姝ヨ溅杈嗗鍋滆溅鍦虹殑浣跨敤鏉冮檺锛岃鎺ュ彛鏀寔杞﹁締缁戝畾銆佽В缁戝綊灞炰汉锛屾敮鎸佹柊澧炪�佹洿鏂般�佹竻绌鸿溅杈嗘巿鏉冧俊鎭�")
@PostMapping("/event/park/carAuthor")
@ApiImplicitParams({
@@ -111,6 +145,7 @@
public ApiResponse parkCarAuthor(@RequestBody CarAuthorRequest param) {
return ApiResponse.success(null);
}
+
@ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉閫氱煡鎺ュ彛", notes = "璁垮绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇峰鎵圭殑缁撴灉")
@PostMapping("/event/approve/notice")
@ApiImplicitParams({
--
Gitblit v1.9.3