From 4f03c6e3bea2ae7c1537fabe3e3bffc3f49b8e86 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 13 十二月 2023 15:43:05 +0800
Subject: [PATCH] aa
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 23 +++++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 1
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java | 3
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java | 15 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 61 +++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java | 4
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 9 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java | 9 +-
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java | 2
server/dmvisit_admin/src/main/java/com/doumee/AdminApplication.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java | 15 ++-
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 1
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 11 ++
server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/HkSyncService.java | 1
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4
server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java | 20 +++-
server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java | 3
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 16 +++
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceEventJoinMapper.java | 2
30 files changed, 183 insertions(+), 45 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/AdminApplication.java b/server/dmvisit_admin/src/main/java/com/doumee/AdminApplication.java
index ac5b7d9..adfd32e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/AdminApplication.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/AdminApplication.java
@@ -15,7 +15,7 @@
@Slf4j
@EnableAsync
@SpringBootApplication
-@MapperScan("com.doumee.dao")
+@MapperScan("com.doumee.dao.*")
public class AdminApplication {
public static void main(String[] args) {
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
index 5eece7b..574e4e3 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java
@@ -78,7 +78,8 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:carevent:exportExcel")
public void exportExcel (@RequestBody PageWrap<CarEvent> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(CarEvent.class).export(carEventService.findPage(pageWrap).getRecords(), "鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃", response);
+ ExcelExporter.build(CarEvent.class).exportWithFirstAndEnd (carEventService.findPage(pageWrap).getRecords(),"鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃", null, "鍋滆溅鍦轰簨浠舵帹閫佽褰曞鍑烘姤琛�",null , response);
+// ExcelExporter.build(CarEvent.class).export(carEventService.findPage(pageWrap).getRecords(), "鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
index c20b9ae..75aa63a 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
@@ -10,6 +10,7 @@
import com.doumee.service.business.impl.hksync.HkSyncPrivilegeServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +23,7 @@
*/
@Api(tags = "ERP鏁版嵁鍚屾鎺ュ彛")
@RestController
-@RequestMapping("/business/erp")
+@RequestMapping("/business/erpsync")
public class ERPSyncController extends BaseController {
@Autowired
@@ -33,9 +34,9 @@
private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService;
@PreventRepeat
- @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
- @PostMapping("/getDevices")
-// @RequiresPermissions("business:hksync:device")
+ @ApiOperation("銆怑RP銆戝叏閲忓悓姝ョ粍缁囦俊鎭帴鍙�")
+ @PostMapping("/syncCompanies")
+ @RequiresPermissions("business:erpsync:company")
public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
String result = hkSyncDeviceService.syncHkDevices(param);
return ApiResponse.success(result);
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
index 79bd91b..8470923 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
@@ -3,6 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
+import com.doumee.core.haikang.model.param.request.EventSubRequest;
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;
@@ -40,25 +41,25 @@
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
- @PostMapping("/getDevices")
+ @PostMapping("/syncDevices")
// @RequiresPermissions("business:hksync:device")
- public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
+ public ApiResponse syncHkDevices(@RequestBody AcsDeviceListRequest param) {
String result = hkSyncDeviceService.syncHkDevices(param);
return ApiResponse.success(result);
}
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
- @PostMapping("/getParks")
+ @PostMapping("/syncParks")
// @RequiresPermissions("business:hksync:park")
- public ApiResponse getParks(@RequestBody ParkListRequest param) {
+ public ApiResponse syncHkParks(@RequestBody ParkListRequest param) {
String result = hkSyncParkService.syncHkParks(param);
return ApiResponse.success(result);
}
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ヨ瀹㈡潈闄愮粍鎺ュ彛")
- @PostMapping("/getPrivilege")
+ @PostMapping("/syncPrivilege")
// @RequiresPermissions("business:hksync:privilege")
- public ApiResponse getPrivilege(@RequestBody PrivilegeGroupRequest param) {
+ public ApiResponse syncPrivilege(@RequestBody PrivilegeGroupRequest param) {
String result = hkSyncPrivilegeService.syncPrivilege(param);
return ApiResponse.success(result);
}
@@ -83,4 +84,11 @@
String result = hkSyncPushService.dealParkEvent(param,response);
return ApiResponse.success(result);
}
+ @PreventRepeat
+ @ApiOperation("銆愭捣搴枫�戝彇娑堣闃呬簨浠�")
+ @PostMapping("/cancelEventSub")
+ public ApiResponse cancelEventSub(@RequestBody EventSubRequest param, HttpServletResponse response) {
+ hkSyncPushService.cancelEventSub();
+ return ApiResponse.success(null);
+ }
}
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 641be3e..edd1a97 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
@@ -103,7 +103,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));
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index b063441..d472dd8 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -50,6 +50,7 @@
String privilegeGroup= "/api/visitor/v1/privilege/group";//鏌ヨ璁垮鏉冮檺缁�
String eventSub= "/api/eventService/v1/eventSubscriptionByEventTypes";//浜嬩欢璁㈤槄
String doorSearch= "/api/resource/v2/door/search";//鏌ヨ闂ㄧ鐐瑰垪琛╲2
+ String cancelEventSub= "/api/eventService/v1/eventUnSubscriptionByEventTypes";//鍙栨秷浜嬩欢璁㈤槄
}
/**
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 19e86dc..c179655 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -390,6 +390,17 @@
saveInterfaceLog(body,result,path);
return result;
}
+ /**
+ * 鍙栨秷浜嬩欢璁㈤槄
+ * @param body
+ * @return
+ */
+ public static String cancelEventSub(String body) {
+ Map<String, String> path = getPath(HKConstants.InterfacePath.cancelEventSub);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ saveInterfaceLog(body,result,path);
+ return result;
+ }
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 123e5b6..cece265 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -251,7 +251,7 @@
* @return
*/
public static BaseResponse<List<ParkListResponse>> parkList(ParkListRequest param){
- log.info("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴疯幏鍙栬溅搴撳垪琛ㄦ暟鎹��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.parkList(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -501,6 +501,27 @@
}
return null;
}
+ /**
+ *浜嬩欢璁㈤槄
+ * @return
+ */
+ public static BaseResponse cancelEventSub(EventSubRequest param){
+ log.info("銆愭捣搴峰彇娑堜簨浠惰闃呫��================寮�濮�===="+JSONObject.toJSONString(param));
+ String res = null;
+ try {
+ res = HKTools.cancelEventSub(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse >(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍙栨秷浜嬩欢璁㈤槄");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰彇娑堜簨浠惰闃呫��================澶辫触====锛歕n"+ e.getMessage());
+ }finally {
+ // saveInterfaceLog(param,res);
+ }
+ return null;
+ }
private static void logResult(BaseResponse res,String name) {
if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java
index d279fb1..37f017b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java
@@ -15,8 +15,8 @@
public class UserAuthorRequest {
@ApiModelProperty(value = "浜哄憳鍞竴鏍囪瘑锛圗RP绔疘D锛�" , required = true)
private String userId;
- @ApiModelProperty(value = "闂ㄧ缁勫敮涓�鏍囪瘑锛堣瀹㈢ID锛�,濡傛灉涓簄ull锛屽垯娓呯┖浜哄憳鎺堟潈淇℃伅" )
- private Integer roleId;
+ @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚堥棬绂佺粍鍞竴鏍囪瘑锛堣瀹㈢ID锛�,濡傛灉涓簄ull锛屽垯娓呯┖浜哄憳鎺堟潈淇℃伅" )
+ private Integer[] roleIds;
@ApiModelProperty(value = "鎺堟潈鏈夋晥鏈燂紙寮�濮嬫椂闂达級锛屼负绌烘椂榛樿闀挎湡鏈夋晥锛屽2023-11-24 11:39:23" )
private Date validStartTime;
@ApiModelProperty(value = "鎺堟潈鏈夋晥鏈燂紙鎴鏃堕棿锛夛紝涓虹┖鏃堕粯璁ら暱鏈熸湁鏁堬紝濡�2023-11-24 11:39:23" )
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 4908f45..430c1e4 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
@@ -40,7 +40,7 @@
private String phone;
@ApiModelProperty(value = "鍗″彿闆嗗悎" )
private List<String> cardList;
- @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�" )
- private Integer roleId;
+ @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�,銆愯瀹㈢銆戝敮涓�鏍囪瘑" )
+ private Integer[] roleIds;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java
index e2f4f03..af00fa9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java
@@ -27,5 +27,7 @@
private Date editDate;
@ApiModelProperty(value = "鎵�灞炵埗绾х粍缁囩紪鐮�")
private String parentOrgId;
+ @ApiModelProperty(value = "璐熻矗浜虹紪鐮�")
+ private String headId;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java
index 92b1a35..f5a15f1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java
@@ -43,6 +43,6 @@
private String phone;
@ApiModelProperty(value = "鍗″彿闆嗗悎" )
private List<String> cardList;
- @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�" )
- private Integer roleId;
+ @ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�,銆愯瀹㈢銆戝敮涓�鏍囪瘑" )
+ private Integer[] roleIds;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java
index 3bb3ab6..371b2f6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java
@@ -7,6 +7,6 @@
/**
* @author T14
*/
-@Repository
+//@Repository
public interface CarEventJoinMapper extends MPJJoinMapper<CarEvent> {
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java
index 1714b65..b4fa3e0 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CompanyJoinMapper.java
@@ -8,6 +8,6 @@
/**
* @author T14
*/
-@Repository
+//@Repository
public interface CompanyJoinMapper extends MPJJoinMapper<Company> {
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceEventJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceEventJoinMapper.java
index 76b525e..f2c9c92 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceEventJoinMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/DeviceEventJoinMapper.java
@@ -7,6 +7,6 @@
/**
* @author T14
*/
-@Repository
+//@Repository
public interface DeviceEventJoinMapper extends MPJJoinMapper<DeviceEvent> {
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java
index 8e31748..348c0f7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java
@@ -8,6 +8,6 @@
/**
* @author T14
*/
-@Repository
+//@Repository
public interface MemberCardJoinMapper extends MPJJoinMapper<MemberCard> {
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java
index 9bcded8..dee96b3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java
@@ -7,6 +7,6 @@
/**
* @author T14
*/
-@Repository
+//@Repository
public interface MemberJoinMapper extends MPJJoinMapper<Member> {
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java
index 95fc433..c42d799 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java
@@ -8,6 +8,6 @@
/**
* @author T14
*/
-@Repository
+//@Repository
public interface ParkBookJoinMapper extends MPJJoinMapper<ParkBook> {
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java
index 91aa8ee..046684d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java
@@ -8,6 +8,6 @@
/**
* @author T14
*/
-@Repository
+//@Repository
public interface RetentionJoinMapper extends MPJJoinMapper<Retention> {
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java
index 656b676..ae61a90 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java
@@ -2,11 +2,10 @@
import com.doumee.dao.business.model.VisitEvent;
import com.github.yulichang.base.mapper.MPJJoinMapper;
-import org.springframework.stereotype.Repository;
/**
* @author T14
*/
-@Repository
+//@Repository
public interface VisitEventJoinMapper extends MPJJoinMapper<VisitEvent> {
}
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 b86c30d..875d8cd 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
@@ -82,9 +82,6 @@
@ExcelColumn(name="鍒嗙被缂栫爜(鍏宠仈category)")
private Integer categoryId;
- @ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
- @TableField(exist = false)
- private String categoryName;
@ApiModelProperty(value = "浼佷笟浠ｇ爜")
@ExcelColumn(name="浼佷笟浠ｇ爜")
@@ -117,6 +114,9 @@
@ApiModelProperty(value = "ERP鏍囪瘑")
@ExcelColumn(name="ERP鏍囪瘑")
private String erpId;
+ @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
+ @ExcelColumn(name="璐熻矗浜虹紪鐮�")
+ private String headId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
@@ -150,4 +150,14 @@
@ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
private Date fsDate;
+ @ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
+ @TableField(exist = false)
+ private String categoryName;
+ @ApiModelProperty(value = "璐熻矗浜哄悕瀛�")
+ @TableField(exist = false)
+ private String headName;
+ @ApiModelProperty(value = "璐熻矗浜烘墜鏈哄彿")
+ @TableField(exist = false)
+ private String headPhone;
+
}
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 335e038..c7cf7a1 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,7 +103,6 @@
* @return PageData<Company>
*/
PageData<Company> findPage(PageWrap<Company> pageWrap);
-
/**
* 鏉′欢缁熻
*
@@ -118,4 +117,5 @@
* @return
*/
List<CompanyDTO> findCompanyTreePage(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 fe614c6..83bdbc4 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
@@ -3,6 +3,9 @@
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.openapi.request.erp.OrgListRequest;
+import com.doumee.core.model.openapi.request.erp.UserInfoRequest;
+import com.doumee.core.model.openapi.request.erp.UserListRequest;
/**
* 鍋滆溅鍦轰簨浠舵帹閫佽褰曡〃Service瀹氫箟
@@ -11,24 +14,24 @@
*/
public interface ERPSyncService {
/**
- * 鍚屾娴峰悍闂ㄧ璁惧
+ * 鍚屾ERP缁勭粐淇℃伅
* @param param
* @return
*/
- String syncErpOrg(AcsDeviceListRequest param);
+ String syncCompany(OrgListRequest param);
/**
- * 鍚屾娴峰悍鍋滆溅搴�
+ * 鍚屾ERP浜哄憳淇℃伅
* @param param
* @return
*/
- String syncHkParks(ParkListRequest param);
+ String syncUsers(UserListRequest param);
/**
- * 鍚屾娴峰悍璁垮鏉冮檺缁�
+ * 鑾峰彇ERP浜哄憳淇℃伅
* @param param
* @return
*/
- String syncPrivilege(PrivilegeGroupRequest param);
+ String syncUserInfo(UserInfoRequest param);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/HkSyncService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/HkSyncService.java
index eccc003..c3ab343 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/HkSyncService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/HkSyncService.java
@@ -51,4 +51,5 @@
String dealVisitEvent(EventVisitRequest param, HttpServletResponse response);
String dealParkEvent(EventParkRequest param, HttpServletResponse response);
+ void cancelEventSub();
}
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 484823e..68aca87 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
@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -143,6 +144,7 @@
IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(Company::getId, pageWrap.getModel().getId());
}
@@ -238,11 +240,12 @@
}
queryWrapper.orderByDesc(Company::getCreateDate);
queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId)
- .leftJoin(SystemUser.class,SystemUser::getId,Company::getCreator);
+ .leftJoin(Member.class, Member::getId,Company::getHeadId);
queryWrapper.selectAll(Company.class)
.selectAs(Category::getName,Company::getCategoryName)
- .select("count(t1.id) as countNum")
- .selectAs(SystemUser::getRealname,Company::getCreatorName);
+ .selectAs(Member::getName,Company::getHeadName)
+ .selectAs(Member::getPhone,Company::getHeadPhone)
+ .select("count(t1.id) as countNum");
IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
return PageData.from(companyIPage);
}
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 0de6db9..983da41 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
@@ -353,7 +353,7 @@
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
MemberInfoDTO model = pageWrap.getModel();
Utils.MP.blankToNull(model);
- Date end = Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime());
+ 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);
@@ -368,7 +368,7 @@
.like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
.like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
.like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
- .having("trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
+ .having(pageWrap.getModel().getTrainTimeEndTime()!=null,"trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
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
new file mode 100644
index 0000000..ee3c8b9
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -0,0 +1,61 @@
+package com.doumee.service.business.impl.erp;
+
+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.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.erp.OrgListRespone;
+import com.doumee.service.business.ERPSyncService;
+import com.doumee.service.business.HkSyncService;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 璁惧淇℃伅琛⊿ervice瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Service
+public class ErpSyncServiceImpl implements ERPSyncService {
+
+ /**
+ * 鍚屾ERP缁勭粐淇℃伅
+ * @param param
+ * @return
+ */
+ @Override
+ public String syncCompany(OrgListRequest param){
+ List<OrgListRespone> allList = new ArrayList<>();
+
+ return null;
+ }
+
+ /**
+ * 鍚屾ERP浜哄憳淇℃伅
+ * @param param
+ * @return
+ */
+ @Override
+ public String syncUsers(UserListRequest param){
+ return null;
+ }
+
+ /**
+ * 鑾峰彇ERP浜哄憳淇℃伅
+ * @param param
+ * @return
+ */
+ @Override
+ public String syncUserInfo(UserInfoRequest param){
+ return null;
+ }
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
index b9a7c91..a50fca1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
@@ -67,4 +67,6 @@
public String dealParkEvent(EventParkRequest param, HttpServletResponse response){
return null;
}
+ @Override
+ public void cancelEventSub(){ }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java
index a6e5ae8..a3ab002 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java
@@ -90,4 +90,19 @@
HKService.eventSub(param);//闂ㄧ浜嬩欢
}
+ /**
+ * 鍙栨秷璁㈤槄闂ㄧ浜嬩欢銆佽瀹簨浠躲�佸拰鍋滆溅鍦轰簨浠�
+ */
+ @Override
+ public void cancelEventSub(){
+ EventSubRequest param = new EventSubRequest();
+ param.setEventTypes(new Integer[]{HKConstants.EventTypes.PARK_LINE_IN.getKey()
+ ,HKConstants.EventTypes.PARK_LINE_OUT.getKey()
+ ,HKConstants.EventTypes.PARK_PASS_IN.getKey()
+ ,HKConstants.EventTypes.PARK_PASS_OUT.getKey()
+ ,HKConstants.EventTypes.VISIT_SIGN_OUT.getKey(),
+ HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()});
+ HKService.cancelEventSub(param);//鍋滆溅鍦轰簨浠�
+
+ }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index ea07eab..aecac74 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -39,7 +39,6 @@
String result = null;
try {
-
log.error("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========鎴愬姛=======");
}catch (Exception e) {
--
Gitblit v1.9.3