From 7edf9a7c98fadade6cfd439083337634e7b80019 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 08 十二月 2023 18:22:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemDictDataController.java | 45 ++
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 29 +
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java | 4
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java | 13
server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java | 139 ++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 37 +
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java | 66 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 8
server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java | 3
server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 15
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitConfigDTO.java | 60 +++
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java | 13
server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java | 13
server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java | 10
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java | 61 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 43 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 11
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java | 30 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java | 2
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 15
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java | 4
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java | 13
server/dmvisit_service/src/main/java/com/doumee/service/business/CompanyService.java | 8
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 9
server/dmvisit_service/src/main/java/com/doumee/service/system/SystemDictDataService.java | 27 +
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 13
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java | 13
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java | 32 +
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/CarsQuery.java | 22 +
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 36 +
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 79 ++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 44 ++
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 31 +
server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 18
server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java | 5
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 55 ++
server/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java | 4
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CompanyDTO.java | 58 ++
server/dmvisit_service/src/main/java/com/doumee/config/mybatis/JSONObjectHandler.java | 58 ++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborConfigDTO.java | 32 +
42 files changed, 1,100 insertions(+), 90 deletions(-)
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 0b18437..5eece7b 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
@@ -10,7 +10,7 @@
import com.doumee.service.business.CarEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -33,7 +33,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:carevent:create")
+// @RequiresPermissions("business:carevent:create")
public ApiResponse create(@RequestBody CarEvent carEvent) {
return ApiResponse.success(carEventService.create(carEvent));
}
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 122e391..41cca71 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
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
import com.doumee.service.business.CompanyService;
import io.swagger.annotations.Api;
@@ -107,4 +108,18 @@
company.setCategoryId(query.getCategoryId());
return ApiResponse.success(companyService.findList(company));
}
+
+
+ /**
+ * 鏌ヨ閮ㄩ棬鍙婂叾瀛愰儴闂ㄤ俊鎭�
+ * @param type 0 鏌ヨ鎵�鏈変俊鎭� 1 鏌ヨ鍐呴儴淇℃伅
+ * @return
+ */
+ @ApiOperation("鏍规嵁绫诲瀷鏌ヨ缁勭粐淇℃伅")
+ @GetMapping("/findCompanyTreePage")
+// @RequiresPermissions("business:company:query")
+ public ApiResponse<List<CompanyDTO>> findCompanyTreePage(Integer type){
+ return ApiResponse.success(companyService.findCompanyTreePage(type));
+ }
+
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
index 19cc1f1..66d4e3c 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java
@@ -10,7 +10,7 @@
import com.doumee.service.business.DeviceEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -33,7 +33,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:deviceevent:create")
+// @RequiresPermissions("business:deviceevent:create")
public ApiResponse create(@RequestBody DeviceEvent deviceEvent) {
return ApiResponse.success(deviceEventService.create(deviceEvent));
}
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 ba74171..9fc2c03 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
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.request.LaborMemberDTO;
+import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
@@ -112,4 +113,18 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(memberService.findById(id));
}
+
+
+ /**
+ *
+ * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
+ * @param pageWrap
+ * @return
+ */
+ @ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
+ @GetMapping("/findMemberInfoPage")
+ @RequiresPermissions("business:member:query")
+ public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
+ return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
+ }
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
index 539af9e..05d9ee1 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java
@@ -10,7 +10,7 @@
import com.doumee.service.business.ProblemLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -33,7 +33,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:problemlog:create")
+// @RequiresPermissions("business:problemlog:create")
public ApiResponse create(@RequestBody ProblemLog problemLog) {
return ApiResponse.success(problemLogService.create(problemLog));
}
@@ -69,7 +69,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:problemlog:query")
+// @RequiresPermissions("business:problemlog:query")
public ApiResponse<PageData<ProblemLog>> findPage (@RequestBody PageWrap<ProblemLog> pageWrap) {
return ApiResponse.success(problemLogService.findPage(pageWrap));
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
index e4f2e72..8ac7476 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
@@ -10,7 +10,7 @@
import com.doumee.service.business.VisitEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemDictDataController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemDictDataController.java
index 5b9c21e..6caa78e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemDictDataController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemDictDataController.java
@@ -8,6 +8,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.admin.request.LaborConfigDTO;
+import com.doumee.dao.admin.request.VisitConfigDTO;
import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.vo.SystemDictDataListVO;
@@ -111,4 +113,47 @@
public ApiResponse<SystemDictData> getSystemDictData(@RequestParam String dictCode, @RequestParam String label) {
return ApiResponse.success(systemDictDataBiz.queryByCode(dictCode,label));
}
+
+ /**
+ * 璁垮鏉ヨ閰嶇疆
+ * @return
+ */
+ @ApiOperation(value = "璁垮鏉ヨ閰嶇疆" )
+ @GetMapping("/getVisitConfigDTO")
+ public ApiResponse<VisitConfigDTO> getVisitConfigDTO(){
+ return ApiResponse.success(systemDictDataService.getVisitConfigDTO());
+ };
+
+ /**
+ * 淇敼璁垮鏉ヨ閰嶇疆
+ * @param visitConfigDTO
+ */
+ @ApiOperation(value = "淇敼璁垮鏉ヨ閰嶇疆" )
+ @PostMapping("/updateVisitConfig")
+ public ApiResponse updateVisitConfig(@RequestBody VisitConfigDTO visitConfigDTO){
+ systemDictDataService.updateVisitConfig(visitConfigDTO);
+ return ApiResponse.success(null);
+ };
+
+
+ /**
+ * 鍔冲姟鏉ヨ閰嶇疆
+ * @return
+ */
+ @ApiOperation(value = "鍔冲姟鏉ヨ閰嶇疆" )
+ @GetMapping("/getLaborConfigDTO")
+ public ApiResponse<LaborConfigDTO> getLaborConfigDTO(){
+ return ApiResponse.success(systemDictDataService.getLaborConfigDTO());
+ };
+
+ /**
+ * 淇敼鍔冲姟鏉ヨ閰嶇疆
+ * @param miniProgrammeDTO
+ */
+ @ApiOperation(value = "淇敼鍔冲姟鏉ヨ閰嶇疆" )
+ @PostMapping("/updateLaborConfigDTO")
+ public ApiResponse updateLaborConfigDTO(@RequestBody LaborConfigDTO miniProgrammeDTO){
+ systemDictDataService.updateLaborConfigDTO(miniProgrammeDTO);
+ return ApiResponse.success(null);
+ };
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/config/mybatis/JSONObjectHandler.java b/server/dmvisit_service/src/main/java/com/doumee/config/mybatis/JSONObjectHandler.java
new file mode 100644
index 0000000..42aea63
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/config/mybatis/JSONObjectHandler.java
@@ -0,0 +1,58 @@
+package com.doumee.config.mybatis;
+
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * @author T14
+ */
+public class JSONObjectHandler implements TypeHandler<JSONObject> {
+ @Override
+ public void setParameter(PreparedStatement preparedStatement, int i, JSONObject o, JdbcType jdbcType) throws SQLException {
+ preparedStatement.setString(i,toString());
+ }
+
+ @Override
+ public JSONObject getResult(ResultSet resultSet, String s) throws SQLException {
+ String str = resultSet.getString(s);
+ if (StringUtils.isBlank(str)){
+ return null;
+ }
+ if (!JSONUtil.isJsonObj(str)){
+ throw new SQLException("瑙ｆ瀽鏁版嵁鏍煎紡鏈夎");
+ }
+ return (JSONObject)JSONObject.parse(str);
+ }
+
+ @Override
+ public JSONObject getResult(ResultSet resultSet, int i) throws SQLException {
+ String str = resultSet.getString(i);
+ if (StringUtils.isBlank(str)){
+ return null;
+ }
+ if (!JSONUtil.isJsonObj(str)){
+ throw new SQLException("瑙ｆ瀽鏁版嵁鏍煎紡鏈夎");
+ }
+ return (JSONObject)JSONObject.parse(str);
+ }
+
+ @Override
+ public JSONObject getResult(CallableStatement callableStatement, int i) throws SQLException {
+ String str = callableStatement.getString(i);
+ if (StringUtils.isBlank(str)){
+ return null;
+ }
+ if (!JSONUtil.isJsonObj(str)){
+ throw new SQLException("瑙ｆ瀽鏁版嵁鏍煎紡鏈夎");
+ }
+ return (JSONObject)JSONObject.parse(str);
+ }
+}
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 fdecd22..c0507f6 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
@@ -1,8 +1,13 @@
package com.doumee.core.utils;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import org.apache.commons.lang3.StringUtils;
+import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLDecoder;
import java.text.SimpleDateFormat;
@@ -35,6 +40,12 @@
public static final String MDJ_LW_REQUIRED = "MDJ_LW_REQUIRED";
public static final String MDJ_VISIT_REQUIRED = "MDJ_VISIT_REQUIRED";
public static final String EDS_PWD ="!@#$%^&QWERTY" ;
+ public static final String ROOT_PATH = "";
+ public static final String FILE_DIR = "";
+ // 璁垮鏉ヨ閰嶇疆
+ public static final String VISIT_CONFIG = "VISIT_CONFIG";
+ // 鍔冲姟鏉ヨ閰嶇疆
+ public static final String LABOR_CONFIG = "LABOR_CONFIG";
public static Date getBirthdyByCardNo(String idCard){
@@ -253,7 +264,27 @@
}
}
+ /**
+ * 瀵硅薄椹煎嘲灞炴�ц浆涓嬪垝绾�
+ * @param object
+ * @return
+ * @throws JsonProcessingException
+ */
+ public static String toUnderlineJSONString(Object object) throws JsonProcessingException {
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+ mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+ String reqJson = mapper.writeValueAsString(object);
+ return reqJson;
+ }
+ public static <T> T toSnakeObject(String json, Class<T> clazz) throws IOException {
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+ T reqJson = mapper.readValue(json, clazz);
+ return reqJson;
+ }
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/CarsQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/CarsQuery.java
new file mode 100644
index 0000000..80e2ff9
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/CarsQuery.java
@@ -0,0 +1,22 @@
+package com.doumee.dao.admin.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("闀挎湡杞︽煡璇�")
+public class CarsQuery {
+
+ @ApiModelProperty(value = "鍏抽敭瀛�")
+ private String keyWords;
+
+ @ApiModelProperty(value = "鍏徃鍚嶇О")
+ private String companyName;
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ private String carNo;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborConfigDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborConfigDTO.java
new file mode 100644
index 0000000..04a666c
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborConfigDTO.java
@@ -0,0 +1,32 @@
+package com.doumee.dao.admin.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("鍔冲姟璁垮閰嶇疆")
+public class LaborConfigDTO {
+
+ @ApiModelProperty(value = "鏉ヨ棰勭害鏂瑰紡")
+ private String reservationWay = "";
+
+ @ApiModelProperty(value = "琚浜烘牎楠屾柟寮�")
+ private String checkVisit = "";
+
+ @ApiModelProperty(value = "鍋ュ悍璇佹槸鍚﹀繀濉�")
+ private String healthCard = "";
+
+ @ApiModelProperty(value = "鍔冲姟鏄惁绛旈")
+ private String isAnswer = "";
+
+ @ApiModelProperty(value = "鍔冲姟绛旈涓婚")
+ private String theme = "";
+
+ @ApiModelProperty(value = "鍔冲姟绛旈璇存槑")
+ private String description = "";
+
+}
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
new file mode 100644
index 0000000..7aa751c
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java
@@ -0,0 +1,32 @@
+package com.doumee.dao.admin.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("浜哄憳鏌ヨ 鍙傛暟")
+public class MemberQuery {
+
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
+ private String keyWords;
+
+ @ApiModelProperty(value = "鏄惁鏈変汉鑴� 0 鍚� 1 鏄�")
+ private Integer hasFace;
+
+ @ApiModelProperty(value = "鍙嫓璁�")
+ private Integer canVisit;
+
+ @ApiModelProperty(value = "鐘舵��")
+ private Integer status;
+
+ @ApiModelProperty(value = "鍏徃IDs")
+ private List<Integer> companyIds;
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
new file mode 100644
index 0000000..5b12a06
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
@@ -0,0 +1,30 @@
+package com.doumee.dao.admin.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("瀹炴椂鍦ㄥ満浜哄憳鏌ヨ")
+public class RetentionQuery {
+
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+ private String keyWords;
+
+ @ApiModelProperty(value = "鍏徃/閮ㄩ棬鍚嶇О")
+ private String companyName;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ private Integer type;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private Date endTime;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitConfigDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitConfigDTO.java
new file mode 100644
index 0000000..1e86537
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitConfigDTO.java
@@ -0,0 +1,60 @@
+package com.doumee.dao.admin.request;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.IOException;
+
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("鍔冲姟鏉ヨ閰嶇疆")
+public class VisitConfigDTO {
+
+ @ApiModelProperty(value = "鏉ヨ棰勭害鏂瑰紡")
+ private String reservationWay = "";
+
+ @ApiModelProperty(value = "琚浜烘牎楠屾柟寮�")
+ private String checkVisit = "";
+
+ @ApiModelProperty(value = "鍋ュ悍璇佹槸鍚﹀繀濉�")
+ private String healthCard = "";
+
+ @ApiModelProperty(value = "鍔冲姟鏄惁绛旈")
+ private String isAnswer = "";
+
+ @ApiModelProperty(value = "鍔冲姟绛旈涓婚")
+ private String theme = "";
+
+ @ApiModelProperty(value = "鍔冲姟绛旈璇存槑")
+ private String description = "";
+
+// /**
+// * 瀵硅薄椹煎嘲灞炴�ц浆涓嬪垝绾�
+// * @param object
+// * @return
+// * @throws JsonProcessingException
+// */
+// public static String toUnderlineJSONString(Object object) throws JsonProcessingException {
+// ObjectMapper mapper = new ObjectMapper();
+// mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+// mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+// String reqJson = mapper.writeValueAsString(object);
+// return reqJson;
+// }
+//
+//
+// public static <T> T toSnakeObject(String json, Class<T> clazz) throws IOException {
+// ObjectMapper mapper = new ObjectMapper();
+// mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+// T reqJson = mapper.readValue(json, clazz);
+// return reqJson;
+// }
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java
new file mode 100644
index 0000000..a17938b
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java
@@ -0,0 +1,66 @@
+package com.doumee.dao.admin.response;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+public class CarsDTO {
+
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ @ExcelColumn(name="杞︾墝鍙�")
+ private String code;
+
+ @ApiModelProperty(value = "杞﹀簱缂栫爜锛堝叧鑱攑arks)")
+ @ExcelColumn(name="杞﹀簱缂栫爜锛堝叧鑱攑arks)")
+ private Integer parkId;
+
+ @ApiModelProperty(value = "杞﹀簱鍚嶇О")
+ @ExcelColumn(name="杞﹀簱鍚嶇О")
+ private Integer parkName;
+
+ @ApiModelProperty(value = "褰掑睘浜虹紪鐮�")
+ @ExcelColumn(name="褰掑睘浜虹紪鐮�")
+ private Integer memberId;
+
+ @ApiModelProperty(value = "褰掑睘浜虹紪鐮�")
+ @ExcelColumn(name="褰掑睘浜哄悕绉�")
+ private String memberName;
+
+ @ApiModelProperty(value = "褰掑睘浜虹紪鐮�")
+ @ExcelColumn(name="褰掑睘浜虹被鍨�")
+ private Integer memberType;
+
+ @ApiModelProperty(value = "褰掑睘浜虹紪鐮�")
+ @ExcelColumn(name="褰掑睘浜烘墍鍦ㄩ儴闂�")
+ private String companyName;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鏃堕棿娈�")
+ @ExcelColumn(name="鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鏃堕棿娈�")
+ private Integer timeType;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @ExcelColumn(name="寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @ExcelColumn(name="缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ private Date createDate;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CompanyDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CompanyDTO.java
new file mode 100644
index 0000000..b9efaad
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CompanyDTO.java
@@ -0,0 +1,58 @@
+package com.doumee.dao.admin.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("缁勭粐妯″瀷")
+public class CompanyDTO {
+
+
+ @ApiModelProperty(value = "鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
+ private Integer status;
+
+ @ApiModelProperty(value = "鎺掑簭鐮�")
+ private Integer sortnum;
+
+ @ApiModelProperty(value = "鍔冲姟浜烘暟")
+ private Integer countNum;
+
+ @ApiModelProperty(value = "鍥炬爣")
+ private String imgurl;
+
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
+ private Integer type;
+
+ @ApiModelProperty(value = "鍒嗙被缂栫爜(鍏宠仈category)")
+ private Integer categoryId;
+
+ @ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
+ private String categoryName;
+
+ @ApiModelProperty(value = "浼佷笟浠ｇ爜")
+ private Integer code;
+
+ @ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
+ private Integer parentId;
+
+ @ApiModelProperty(value = "鑱旂郴浜哄鍚�")
+ private String linkName;
+
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String linkPhone;
+
+ @ApiModelProperty(value = "瀛愰儴闂�")
+ private List<CompanyDTO> companyDTOList;
+}
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 45cdff7..6328ae1 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
@@ -82,6 +82,19 @@
@ApiModelProperty(value = "寰俊openid")
private String openid;
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜")
+ private Integer roleId;
+
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
+ private String roleName;
+
+ @ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�")
+ private String canVisit;
+
+
+ @ApiModelProperty(value = "鍗＄墖鏁�")
+ private Integer memberCardCount;
+
@ApiModelProperty(value = "鍩硅鏈夋晥鏈熺粨鏉熸椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date trainTimeEndTime;
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
new file mode 100644
index 0000000..8e31748
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberCardJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.DeviceEvent;
+import com.doumee.dao.business.model.MemberCard;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface MemberCardJoinMapper extends MPJJoinMapper<MemberCard> {
+}
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
new file mode 100644
index 0000000..95fc433
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+
+import com.doumee.dao.business.model.ParkBook;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@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
new file mode 100644
index 0000000..91aa8ee
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+
+import com.doumee.dao.business.model.Retention;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface RetentionJoinMapper extends MPJJoinMapper<Retention> {
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 3ab65c5..0a97010 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -90,10 +90,12 @@
@ApiModelProperty(value = "鎶ヨ杈撳叆/闃插尯閫氶亾", example = "1")
@ExcelColumn(name="鎶ヨ杈撳叆/闃插尯閫氶亾")
+ @TableField("ext_event_alarm_in_id")
private Integer extEventAlarmInID;
@ApiModelProperty(value = "鎶ヨ杈撳嚭閫氶亾", example = "1")
@ExcelColumn(name="鎶ヨ杈撳嚭閫氶亾")
+ @TableField("ext_event_alarm_out_id")
private Integer extEventAlarmOutID;
@ApiModelProperty(value = "鍗″彿")
@@ -102,6 +104,7 @@
@ApiModelProperty(value = "浜嬩欢杈撳叆閫氶亾", example = "1")
@ExcelColumn(name="浜嬩欢杈撳叆閫氶亾")
+ @TableField("ext_event_case_id")
private Integer extEventCaseID;
@ApiModelProperty(value = "浜嬩欢绫诲瀷浠ｇ爜", example = "1")
@@ -110,22 +113,27 @@
@ApiModelProperty(value = "闂ㄧ紪鍙�", example = "1")
@ExcelColumn(name="闂ㄧ紪鍙�")
+ @TableField("ext_event_door_id")
private Integer extEventDoorID;
@ApiModelProperty(value = "韬唤璇佸浘鐗嘦RL")
@ExcelColumn(name="韬唤璇佸浘鐗嘦RL")
+ @TableField("ext_event_idcard_picture_url")
private String extEventIDCardPictureURL;
@ApiModelProperty(value = "杩涘嚭鏂瑰悜 1-杩� 0-鍑� -1:鏈煡 瑕佹眰锛氳繘闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�1锛屽嚭闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�2", example = "1")
@ExcelColumn(name="杩涘嚭鏂瑰悜 1-杩� 0-鍑� -1:鏈煡 瑕佹眰锛氳繘闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�1锛屽嚭闂ㄨ鍗″櫒鎷ㄧ爜璁剧疆涓�2")
+ @TableField("ext_event_in_out")
private Integer extEventInOut;
@ApiModelProperty(value = "灏卞湴鎺у埗鍣╥d", example = "1")
@ExcelColumn(name="灏卞湴鎺у埗鍣╥d")
+ @TableField("ext_event_local_controller_id")
private Integer extEventLocalControllerID;
@ApiModelProperty(value = "涓昏澶囨嫧鐮�", example = "1")
@ExcelColumn(name="涓昏澶囨嫧鐮�")
+ @TableField("ext_event_main_dev_id")
private Integer extEventMainDevID;
@ApiModelProperty(value = "浜哄憳缂栧彿")
@@ -138,10 +146,12 @@
@ApiModelProperty(value = "璇诲崱鍣╥d", example = "1")
@ExcelColumn(name="璇诲崱鍣╥d")
+ @TableField("ext_event_reader_id")
private Integer extEventReaderID;
@ApiModelProperty(value = "鍥剧墖鐨剈rl")
@ExcelColumn(name="鍥剧墖鐨剈rl")
+ @TableField("ext_event_picture_url")
private String extEventPictureURL;
@ApiModelProperty(value = "鍥剧墖瀛樺偍鏈嶅姟鍣ㄥ敮涓�鏍囪瘑")
@@ -154,15 +164,17 @@
@ApiModelProperty(value = "缇ょ粍缂栧彿", example = "1")
@ExcelColumn(name="缇ょ粍缂栧彿")
+ @TableField("ext_event_role_id")
private Integer extEventRoleID;
@ApiModelProperty(value = "鍒嗘帶鍒跺櫒纭欢ID", example = "1")
@ExcelColumn(name="鍒嗘帶鍒跺櫒纭欢ID")
- private Integer extEventSubDevID;
+ @TableField("ext_event_eub_dev_id")
+ private Integer extEventEubDevID;
@ApiModelProperty(value = "鍒峰崱娆℃暟", example = "1")
@ExcelColumn(name="鍒峰崱娆℃暟")
- private Integer extEventSwipNum;
+ private Integer extEventEwipNum;
@ApiModelProperty(value = "闂ㄧ浜嬩欢绫诲瀷", example = "1")
@ExcelColumn(name="闂ㄧ浜嬩欢绫诲瀷")
@@ -170,10 +182,12 @@
@ApiModelProperty(value = "澶氶噸璁よ瘉搴忓彿", example = "1")
@ExcelColumn(name="澶氶噸璁よ瘉搴忓彿")
+ @TableField("ext_event_verify_id")
private Long extEventVerifyID;
@ApiModelProperty(value = "鐧藉悕鍗曞崟鍙�")
@ExcelColumn(name="鐧藉悕鍗曞崟鍙�")
+ @TableField("ext_event_white_list_no")
private String extEventWhiteListNo;
@ApiModelProperty(value = "浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
index 214b280..86ee196 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.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;
@@ -21,11 +22,11 @@
public class MemberCard {
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ApiModelProperty(value = "涓婚敭")
@ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@@ -34,7 +35,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@@ -43,7 +44,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
- @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@@ -51,9 +52,24 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛�)", example = "1")
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛�)")
@ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛�)")
private Integer memberId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜鍚嶇О")
+ @ExcelColumn(name="鐢ㄦ埛缂栫爜鍚嶇О")
+ @TableField(exist = false)
+ private String memberName;
+
+ @ApiModelProperty(value = "鐢ㄦ埛鐢佃瘽")
+ @ExcelColumn(name="鐢ㄦ埛鐢佃瘽")
+ @TableField(exist = false)
+ private String memberPhone;
+
+ @ApiModelProperty(value = "鍏徃缁勭粐鍚嶇О")
+ @ExcelColumn(name="鍏徃缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
@ApiModelProperty(value = "鍗″彿")
@ExcelColumn(name="鍗″彿")
@@ -63,11 +79,11 @@
@ExcelColumn(name="鍗″瘑")
private String passward;
- @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+ @ApiModelProperty(value = "娴峰悍鏍囪瘑")
@ExcelColumn(name="娴峰悍鏍囪瘑")
private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer hkStatus;
@@ -76,8 +92,12 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
- @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤")
@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
+
+ @ApiModelProperty(value = "鍏抽敭瀛�")
+ @TableField(exist = false)
+ private String KeyWords;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
index adab9b8..d8b3069 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
@@ -1,5 +1,8 @@
package com.doumee.dao.business.model;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.doumee.config.mybatis.JSONObjectHandler;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +21,7 @@
*/
@Data
@ApiModel("璁垮绛旈璁板綍琛�")
-@TableName("`problem_log`")
+@TableName(value = "`problem_log`",autoResultMap = true)
public class ProblemLog {
@TableId(type = IdType.AUTO)
@@ -70,12 +73,18 @@
@ApiModelProperty(value = "绛旈鏄庣粏锛宩son瀛樺偍")
@ExcelColumn(name="绛旈鏄庣粏锛宩son瀛樺偍")
- private String content;
+ @TableField(value = "content", typeHandler = JSONObjectHandler.class)
+ private JSONObject content;
@ApiModelProperty(value = "绛旈浜哄鍚�")
@ExcelColumn(name="绛旈浜哄鍚�")
private String name;
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ @TableField(exist = false)
+ private Integer type;
+
@ApiModelProperty(value = "绛旈浜烘墜鏈哄悗")
@ExcelColumn(name="绛旈浜烘墜鏈哄悗")
private String phone;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 8ec02d3..00540e4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.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;
@@ -21,11 +22,11 @@
public class Retention {
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ApiModelProperty(value = "涓婚敭")
@ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@@ -34,7 +35,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@@ -43,7 +44,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
- @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@@ -51,7 +52,7 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
@ExcelColumn(name="鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
private Integer companyId;
@@ -63,7 +64,7 @@
@ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐", example = "1")
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
@ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
private Integer type;
@@ -101,7 +102,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date eventDate;
- @ApiModelProperty(value = "璁垮ID(鍏宠仈member)", example = "1")
+ @ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
@ExcelColumn(name="璁垮ID(鍏宠仈member)")
private Integer memberId;
@@ -109,4 +110,18 @@
@ExcelColumn(name="浜嬩欢绫诲瀷鐮�")
private String eventCode;
+ @ApiModelProperty(value = "鍏徃缁勭粐")
+ @ExcelColumn(name="鍏徃缁勭粐")
+ @TableField(exist = false)
+ public String companyName;
+
+ @ApiModelProperty(value = "璁垮鐢ㄦ埛绫诲瀷")
+ @ExcelColumn(name="璁垮鐢ㄦ埛绫诲瀷")
+ @TableField(exist = false)
+ private Integer memberType;
+
+ @ApiModelProperty(value = "闂ㄧ鍚嶇О")
+ @ExcelColumn(name="闂ㄧ鍚嶇О")
+ @TableField(exist = false)
+ private String srcName;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
index 4af9a03..468374a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
@@ -163,4 +163,8 @@
@ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
private String beVisitedPersonOrgId;
+ @ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁噄d")
+ @ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
+ private String idcardDecode;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
index 7aaeae9..168a713 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
@@ -2,6 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.CarsQuery;
+import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.model.Cars;
import java.util.List;
@@ -14,7 +16,7 @@
/**
* 鍒涘缓
- *
+ *
* @param cars 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -78,7 +80,7 @@
* @return List<Cars>
*/
List<Cars> findList(Cars cars);
-
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -94,4 +96,11 @@
* @return long
*/
long count(Cars cars);
+
+ /**
+ * 闀挎湡杞︽煡璇�
+ * @param pageWrap
+ * @return
+ */
+ PageData<CarsDTO> findCarPage(PageWrap<CarsQuery> pageWrap);
}
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 4909605..335e038 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
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
import java.util.List;
@@ -110,4 +111,11 @@
* @return long
*/
long count(Company company);
+
+ /**
+ * 鏌ヨ閮ㄩ棬鍙婂叾瀛愰儴闂ㄤ俊鎭�
+ * @param type 0 鏌ヨ鎵�鏈変俊鎭� 1 鏌ヨ鍐呴儴淇℃伅
+ * @return
+ */
+ List<CompanyDTO> findCompanyTreePage(Integer type);
}
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 8a281a4..5078d2c 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
@@ -5,6 +5,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
+import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.response.WxAuthorizeVO;
@@ -136,6 +137,14 @@
void importMemberBatch(LaborEmpowerDTO laborEmpowerDTO);
+ /**
+ *
+ * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
+ * @param pageWrap
+ * @return
+ */
+ PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
+
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
index 8ce4763..64367d5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.response.ProblemDTO;
import com.doumee.dao.business.model.Problems;
import com.doumee.dao.web.response.ProblemsVO;
@@ -110,5 +111,5 @@
* @param useType
* @return
*/
- List<Problems> findListByUseType(Integer useType);
+ List<ProblemDTO> findListByUseType(Integer useType);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
index 72aeb5c..58d4563 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
@@ -2,7 +2,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.model.Retention;
+import com.doumee.dao.business.model.TrainTime;
+
import java.util.List;
/**
@@ -14,7 +17,7 @@
/**
* 鍒涘缓
- *
+ *
* @param retention 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -78,7 +81,7 @@
* @return List<Retention>
*/
List<Retention> findList(Retention retention);
-
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -94,4 +97,7 @@
* @return long
*/
long count(Retention retention);
+
+
+ PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
index ea8de9f..d2b202f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.model.TrainTime;
import java.util.List;
@@ -14,7 +15,7 @@
/**
* 鍒涘缓
- *
+ *
* @param trainTime 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -78,7 +79,7 @@
* @return List<TrainTime>
*/
List<TrainTime> findList(TrainTime trainTime);
-
+
/**
* 鍒嗛〉鏌ヨ
*
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 a14ea39..a9e946f 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
@@ -3,13 +3,17 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
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.model.Cars;
+import com.doumee.dao.business.join.ParkBookJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.CarsService;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +30,9 @@
@Autowired
private CarsMapper carsMapper;
+
+ @Autowired
+ private ParkBookJoinMapper parkBookJoinMapper;
@Override
public Integer create(Cars cars) {
@@ -83,7 +90,7 @@
QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
return carsMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {
IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -161,4 +168,30 @@
QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
return carsMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<CarsDTO> findCarPage(PageWrap<CarsQuery> pageWrap) {
+ MPJLambdaWrapper<ParkBook> wrapper = new MPJLambdaWrapper<>();
+ IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ Utils.MP.blankToNull(pageWrap.getModel());
+ wrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
+ wrapper.selectAs(ParkBook::getCarCode,CarsDTO::getCode)
+ .selectAs(ParkBook::getParkId,CarsDTO::getParkId)
+ .selectAs(ParkBook::getRemark,CarsDTO::getRemark)
+ .selectAs(Parks::getName,CarsDTO::getParkName)
+ .selectAs(ParkBook::getMemberId,CarsDTO::getMemberId)
+ .selectAs(Member::getName,CarsDTO::getMemberName)
+ .selectAs(Member::getType,CarsDTO::getMemberType)
+ .selectAs(Company::getName,CarsDTO::getCompanyName)
+ .selectAs(ParkBook::getTimeType,CarsDTO::getTimeType)
+ .selectAs(ParkBook::getStartTime,CarsDTO::getStartTime)
+ .selectAs(ParkBook::getEndTime,CarsDTO::getEndTime)
+ .selectAs(ParkBook::getCreateDate,CarsDTO::getCreateDate);
+ wrapper.orderByDesc(ParkBook::getCreateDate);
+ IPage<CarsDTO> carsDTOIPage = parkBookJoinMapper.selectJoinPage(page, CarsDTO.class, wrapper);
+
+ return PageData.from(carsDTOIPage);
+ }
}
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 5958cf0..484823e 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
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -7,6 +9,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Category;
@@ -18,13 +21,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.collections.CollectionUtils;
import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 浼佷笟淇℃伅琛⊿ervice瀹炵幇
@@ -245,6 +253,41 @@
return companyMapper.selectCount(wrapper);
}
+
+ @Override
+ public List<CompanyDTO> findCompanyTreePage(Integer type) {
+
+ LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();
+
+ wrapper.eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Constants.equalsInteger(type,Constants.ONE),Company::getType,type);
+ List<Company> companies = companyMapper.selectList(wrapper);
+ return getCompanyTree( companies, null);
+ }
+
+
+ private List<CompanyDTO> getCompanyTree(List<Company> companies, Integer parentId){
+ if (CollectionUtils.isEmpty(companies)){
+ return null;
+ }
+ List<Company> collect = companies.stream()
+ .filter(s -> Constants.equalsInteger(s.getParentId(), parentId))
+ .collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(companies)){
+ return null;
+ }
+ List<CompanyDTO> companyDTOList = new ArrayList<>();
+ for (int i = 0; i < collect.size(); i++) {
+ Company company = collect.get(i);
+ CompanyDTO companyDTO = new CompanyDTO();
+ BeanUtils.copyProperties(company,companyDTO);
+ companyDTO.setCompanyDTOList(getCompanyTree(companies, company.getId()));
+ companyDTOList.add(companyDTO);
+ }
+ return companyDTOList;
+ }
+
+
/**
* 鍔冲姟鍏徃鍞竴鎬ф牎楠�
* @param company
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index 7c6bcb5..93c504e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -206,11 +206,11 @@
if (pageWrap.getModel().getExtEventRoleID() != null) {
queryWrapper.lambda().eq(DeviceEvent::getExtEventRoleID, pageWrap.getModel().getExtEventRoleID());
}
- if (pageWrap.getModel().getExtEventSubDevID() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getExtEventSubDevID, pageWrap.getModel().getExtEventSubDevID());
+ if (pageWrap.getModel().getExtEventEubDevID() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventEubDevID, pageWrap.getModel().getExtEventEubDevID());
}
- if (pageWrap.getModel().getExtEventSwipNum() != null) {
- queryWrapper.lambda().eq(DeviceEvent::getExtEventSwipNum, pageWrap.getModel().getExtEventSwipNum());
+ if (pageWrap.getModel().getExtEventEwipNum() != null) {
+ queryWrapper.lambda().eq(DeviceEvent::getExtEventEwipNum, pageWrap.getModel().getExtEventEwipNum());
}
if (pageWrap.getModel().getExtEventType() != null) {
queryWrapper.lambda().eq(DeviceEvent::getExtEventType, pageWrap.getModel().getExtEventType());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index 6ab53c2..58a2b9c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -1,20 +1,28 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberCardMapper;
+import com.doumee.dao.business.join.MemberCardJoinMapper;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCard;
import com.doumee.service.business.MemberCardService;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +34,9 @@
@Autowired
private MemberCardMapper memberCardMapper;
+
+ @Autowired
+ private MemberCardJoinMapper memberCardJoinMapper;
@Override
public Integer create(MemberCard memberCard) {
@@ -83,65 +94,79 @@
QueryWrapper<MemberCard> wrapper = new QueryWrapper<>(memberCard);
return memberCardMapper.selectList(wrapper);
}
-
+
@Override
public PageData<MemberCard> findPage(PageWrap<MemberCard> pageWrap) {
IPage<MemberCard> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<MemberCard> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<MemberCard> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(MemberCard::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(MemberCard::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(MemberCard::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(MemberCard::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(MemberCard::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(MemberCard::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(MemberCard::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(MemberCard::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(MemberCard::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(MemberCard::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(MemberCard::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(MemberCard::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(MemberCard::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(MemberCard::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(MemberCard::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(MemberCard::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(MemberCard::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(MemberCard::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(MemberCard::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(MemberCard::getMemberId, pageWrap.getModel().getMemberId());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(MemberCard::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(MemberCard::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getPassward() != null) {
- queryWrapper.lambda().eq(MemberCard::getPassward, pageWrap.getModel().getPassward());
+ queryWrapper.eq(MemberCard::getPassward, pageWrap.getModel().getPassward());
}
if (pageWrap.getModel().getHkId() != null) {
- queryWrapper.lambda().eq(MemberCard::getHkId, pageWrap.getModel().getHkId());
+ queryWrapper.eq(MemberCard::getHkId, pageWrap.getModel().getHkId());
}
if (pageWrap.getModel().getHkStatus() != null) {
- queryWrapper.lambda().eq(MemberCard::getHkStatus, pageWrap.getModel().getHkStatus());
+ queryWrapper.eq(MemberCard::getHkStatus, pageWrap.getModel().getHkStatus());
}
if (pageWrap.getModel().getHkDate() != null) {
- queryWrapper.lambda().ge(MemberCard::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
- queryWrapper.lambda().le(MemberCard::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
+ queryWrapper.ge(MemberCard::getHkDate, Utils.Date.getStart(pageWrap.getModel().getHkDate()));
+ queryWrapper.le(MemberCard::getHkDate, Utils.Date.getEnd(pageWrap.getModel().getHkDate()));
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(MemberCard::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(MemberCard::getStatus, pageWrap.getModel().getStatus());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(memberCardMapper.selectPage(page, queryWrapper));
+ queryWrapper.orderByDesc(MemberCard::getCreateDate);
+
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+
+ queryWrapper.leftJoin(Member.class,Member::getId,MemberCard::getMemberId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(MemberCard.class)
+ .selectAs(Member::getName,MemberCard::getMemberName)
+ .selectAs(Member::getPhone,MemberCard::getMemberPhone)
+ .selectAs(Company::getName,MemberCard::getCompanyName);
+ queryWrapper.like(Objects.nonNull(pageWrap.getModel().getCode()),MemberCard::getCode,pageWrap.getModel().getCode())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
+ .eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
+ .like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
+ .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords());
+ IPage<MemberCard> memberCardIPage = memberCardJoinMapper.selectJoinPage(page, MemberCard.class,queryWrapper);
+ return PageData.from(memberCardIPage);
}
@Override
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 fd71f8c..359e435 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
@@ -2,8 +2,11 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
+import cn.hutool.core.util.ReUtil;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.Jwt.JwtPayLoad;
@@ -20,14 +23,12 @@
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
+import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.TrainTimeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.Empower;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.TrainTime;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -383,8 +384,43 @@
}
+ @Override
+ public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+ IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ MemberQuery model = pageWrap.getModel();
+ Utils.MP.blankToNull(model);
+
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(DeviceRole.class,DeviceRole::getId,Member::getRoleId)
+ .leftJoin(MemberCard.class,MemberCard::getMemberId,Member::getId);
+
+ queryWrapper.selectAll(Member.class)
+ .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
+ .selectAs(DeviceRole::getName,MemberInfoDTO::getRoleName)
+ .select("count(t3.id) as memberCardCount ");
+
+ queryWrapper.in(Objects.nonNull(model.getCompanyIds()),Member::getCompanyId,model.getCompanyIds())
+ .like(number,Member::getPhone,model.getKeyWords())
+ .like((b||hasWord),Member::getPhone,model.getKeyWords())
+ .isNull(Constants.equalsInteger(model.getHasFace(),Constants.ZERO),Member::getFaceId)
+ .isNotNull(Constants.equalsInteger(model.getHasFace(),Constants.ONE),Member::getFaceId)
+ .eq(Objects.nonNull(model.getCanVisit()),Member::getCanVisit,model.getCanVisit())
+ .eq(Objects.nonNull(model.getStatus()),Member::getStatus,model.getStatus());
+ IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
+ if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
+ memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
+ }
+ return PageData.from(memberIPage);
+ }
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index 1d303c3..98888bc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -102,7 +102,7 @@
QueryWrapper<ProblemLog> wrapper = new QueryWrapper<>(problemLog);
return problemLogMapper.selectList(wrapper);
}
-
+
@Override
public PageData<ProblemLog> findPage(PageWrap<ProblemLog> pageWrap) {
IPage<ProblemLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -161,13 +161,8 @@
if (pageWrap.getModel().getOpenid() != null) {
queryWrapper.lambda().eq(ProblemLog::getOpenid, pageWrap.getModel().getOpenid());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.select("problem_log.*,(select type from member where member.openid = problem_log.openid) as type");
+ queryWrapper.orderByAsc("problem_log.createDate");
return PageData.from(problemLogMapper.selectPage(page, queryWrapper));
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
index 836e413..397f583 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -1,9 +1,13 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.doumee.core.model.LoginUserInfo;
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.response.ProblemDTO;
import com.doumee.dao.business.ProblemsMapper;
import com.doumee.dao.business.model.Problems;
import com.doumee.dao.web.response.ProblemsVO;
@@ -13,12 +17,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.BeanUtils;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 璇曢淇℃伅琛⊿ervice瀹炵幇
@@ -33,8 +41,24 @@
@Override
public Integer create(Problems problems) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Problems insert = new Problems();
+
+ insert.setCreator(loginUserInfo.getId());
+ insert.setCreateDate(new Date());
+ insert.setEditor(loginUserInfo.getId());
+ insert.setEditDate(new Date());
+ insert.setIsdeleted(Constants.ZERO);
+ insert.setRemark(problems.getRemark());
+ insert.setTitle(problems.getTitle());
+ insert.setOptions(problems.getOptions());
+ insert.setAnswer(problems.getAnswer());
+ insert.setSortnu(problems.getSortnu());
+ insert.setType(problems.getType());
+ insert.setScore(problems.getScore());
+ insert.setUseType(problems.getUseType());
problemsMapper.insert(problems);
- return problems.getId();
+ return insert.getId();
}
@Override
@@ -58,7 +82,19 @@
@Override
public void updateById(Problems problems) {
- problemsMapper.updateById(problems);
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Problems update = new Problems();
+ update.setId(problems.getId());
+ update.setEditor(loginUserInfo.getId());
+ update.setEditDate(new Date());
+ update.setTitle(problems.getTitle());
+ update.setOptions(problems.getOptions());
+ update.setAnswer(problems.getAnswer());
+ update.setSortnu(problems.getSortnu());
+ update.setType(problems.getType());
+ update.setScore(problems.getScore());
+ update.setUseType(problems.getUseType());
+ problemsMapper.updateById(update);
}
@Override
@@ -117,7 +153,7 @@
queryWrapper.lambda().eq(Problems::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(Problems::getTitle, pageWrap.getModel().getTitle());
+ queryWrapper.lambda().like(Problems::getTitle, pageWrap.getModel().getTitle());
}
if (pageWrap.getModel().getOptions() != null) {
queryWrapper.lambda().eq(Problems::getOptions, pageWrap.getModel().getOptions());
@@ -137,7 +173,7 @@
if (pageWrap.getModel().getUseType() != null) {
queryWrapper.lambda().eq(Problems::getUseType, pageWrap.getModel().getUseType());
}
- queryWrapper.lambda().orderByAsc(Problems::getCreateDate);
+ queryWrapper.lambda().orderByAsc(Problems::getSortnu);
queryWrapper.select("problems.*, (select REALNAME from system_user where system_user.id = problems.CREATOR) as creatorName");
return PageData.from(problemsMapper.selectPage(page, queryWrapper));
}
@@ -149,9 +185,22 @@
}
@Override
- public List<Problems> findListByUseType(Integer useType) {
+ public List<ProblemDTO> findListByUseType(Integer useType) {
+ LambdaQueryWrapper<Problems> wrapper = new LambdaQueryWrapper<>();
- return null;
+ wrapper.eq(Problems::getIsdeleted, Constants.ZERO)
+ .eq(Problems::getUseType, useType)
+ .orderByAsc(Problems::getSortnu);
+ List<Problems> problems = problemsMapper.selectList(wrapper);
+
+ List<ProblemDTO> collect = problems.stream().map(s -> {
+ ProblemDTO dto = new ProblemDTO();
+ BeanUtils.copyProperties(dto, s);
+ return dto;
+ }).collect(Collectors.toList());
+
+ return collect;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index dec9e5e..6339165 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -1,20 +1,28 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.RetentionMapper;
-import com.doumee.dao.business.model.Retention;
+import com.doumee.dao.business.join.RetentionJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.RetentionService;
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;
import java.util.List;
+import java.util.Objects;
/**
* 鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛塖ervice瀹炵幇
@@ -26,6 +34,10 @@
@Autowired
private RetentionMapper retentionMapper;
+
+ @Autowired
+ private RetentionJoinMapper retentionJoinMapper;
+
@Override
public Integer create(Retention retention) {
@@ -83,7 +95,7 @@
QueryWrapper<Retention> wrapper = new QueryWrapper<>(retention);
return retentionMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Retention> findPage(PageWrap<Retention> pageWrap) {
IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -171,4 +183,43 @@
QueryWrapper<Retention> wrapper = new QueryWrapper<>(retention);
return retentionMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap) {
+
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+
+ IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId)
+ .leftJoin(Member.class,Member::getId,Retention::getMemberId)
+ .leftJoin(DeviceEvent.class,DeviceEvent::getEventId,Retention::getEventCode);
+ queryWrapper.selectAll(Retention.class)
+ .selectAs(Company::getName,Retention::getCompanyName)
+ .selectAs(Member::getType,Retention::getMemberType)
+ .selectAs(DeviceEvent::getSrcName,Retention::getSrcName);
+ queryWrapper.like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
+ .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords())
+ .eq(Objects.nonNull(pageWrap.getModel().getType()),
+ Member::getType,
+ pageWrap.getModel().getType())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ Retention::getEventDate,
+ Utils.Date.getStart(pageWrap.getModel().getStartTime()))
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ Retention::getEventDate,
+ Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+ queryWrapper.orderByDesc(Retention::getCreateDate);
+ IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
+ return PageData.from(retentionIPage);
+ }
}
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 8a4bb79..c5d18cc 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
@@ -27,6 +27,8 @@
@Autowired
private TrainTimeMapper trainTimeMapper;
+
+
@Override
public Integer create(TrainTime trainTime) {
trainTimeMapper.insert(trainTime);
@@ -83,7 +85,7 @@
QueryWrapper<TrainTime> wrapper = new QueryWrapper<>(trainTime);
return trainTimeMapper.selectList(wrapper);
}
-
+
@Override
public PageData<TrainTime> findPage(PageWrap<TrainTime> pageWrap) {
IPage<TrainTime> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -142,4 +144,6 @@
QueryWrapper<TrainTime> wrapper = new QueryWrapper<>(trainTime);
return trainTimeMapper.selectCount(wrapper);
}
+
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/system/SystemDictDataService.java b/server/dmvisit_service/src/main/java/com/doumee/service/system/SystemDictDataService.java
index 6d3fb87..c0ce5d2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/system/SystemDictDataService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/system/SystemDictDataService.java
@@ -2,6 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.LaborConfigDTO;
+import com.doumee.dao.admin.request.VisitConfigDTO;
import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.vo.SystemDictDataListVO;
@@ -70,7 +72,7 @@
* @date 2023/03/21 14:49
*/
List<SystemDictData> findList(SystemDictData systemDictData);
-
+
/**
* 鍒嗛〉鏌ヨ
* @author Eva.Caesar Liu
@@ -96,5 +98,28 @@
List<SystemDictData> findList(Integer dicId,List<String> codes);
+ /**
+ * 璁垮鏉ヨ閰嶇疆
+ * @return
+ */
+ VisitConfigDTO getVisitConfigDTO();
+ /**
+ * 淇敼璁垮鏉ヨ閰嶇疆
+ * @param miniProgrammeDTO
+ */
+ void updateVisitConfig(VisitConfigDTO miniProgrammeDTO);
+
+
+ /**
+ * 鍔冲姟鏉ヨ閰嶇疆
+ * @return
+ */
+ LaborConfigDTO getLaborConfigDTO();
+
+ /**
+ * 淇敼鍔冲姟鏉ヨ閰嶇疆
+ * @param miniProgrammeDTO
+ */
+ void updateLaborConfigDTO(LaborConfigDTO miniProgrammeDTO);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
index a34d8ba..f4a56d5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
@@ -1,9 +1,15 @@
package com.doumee.service.system.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.admin.request.LaborConfigDTO;
+import com.doumee.dao.admin.request.VisitConfigDTO;
+import com.doumee.dao.system.SystemDictMapper;
import com.doumee.dao.system.model.SystemDict;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.doumee.core.model.PageData;
@@ -22,6 +28,7 @@
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 瀛楀吀鏁版嵁Service瀹炵幇
@@ -34,6 +41,8 @@
@Autowired
private SystemDictDataMapper systemDictDataMapper;
+ @Autowired
+ private SystemDictMapper systemDictMapper;
@Override
public Integer create(SystemDictData systemDictData) {
systemDictDataMapper.insert(systemDictData);
@@ -91,7 +100,7 @@
Wrapper<SystemDictData> wrapper = new QueryWrapper<>(systemDictData);
return systemDictDataMapper.selectList(wrapper);
}
-
+
@Override
public PageData<SystemDictDataListVO> findPage(PageWrap<QuerySystemDictDataDTO> pageWrap) {
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
@@ -112,4 +121,132 @@
.in(SystemDictData::getLabel,codes);
return systemDictDataMapper.selectList(wrapper);
}
+
+ @Override
+ public VisitConfigDTO getVisitConfigDTO() {
+
+ try {
+ String jasonStr = Constants.toUnderlineJSONString(new VisitConfigDTO());
+ JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
+ List<String> collect = parse.entrySet().stream().map(s -> s.getKey().toUpperCase()).collect(Collectors.toList());
+
+ QueryWrapper<SystemDict> systemDictQuery = new QueryWrapper<>();
+ systemDictQuery.lambda()
+ .eq(SystemDict::getDeleted,Boolean.FALSE)
+ .eq(SystemDict::getCode,Constants.VISIT_CONFIG);
+ SystemDict systemDict = systemDictMapper.selectOne(systemDictQuery);
+
+ if (Objects.isNull(systemDict)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"瀛楀吀涓嶅瓨鍦�");
+ }
+ QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(SystemDictData::getDictId,systemDict.getId())
+ .in(SystemDictData::getLabel,collect);
+ List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
+ if (CollectionUtils.isEmpty(systemDictData)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"瀛楀吀鍊间笉瀛樺湪");
+ }
+ systemDictData.forEach(s->{
+ parse.put(s.getLabel().toLowerCase(),s.getCode());
+ });
+ String s = parse.toJSONString();
+ VisitConfigDTO miniProgrammeDTO = Constants.toSnakeObject(s, VisitConfigDTO.class);
+ return miniProgrammeDTO;
+ } catch (Exception e) {
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀛楀吀鍊艰В鏋愭湁璇�");
+ }
+ }
+
+ @Override
+ public void updateVisitConfig(VisitConfigDTO miniProgrammeDTO) {
+ try {
+
+ QueryWrapper<SystemDict> systemDictQuery = new QueryWrapper<>();
+ systemDictQuery.lambda()
+ .eq(SystemDict::getDeleted,Boolean.FALSE)
+ .eq(SystemDict::getCode,Constants.VISIT_CONFIG);
+ SystemDict systemDict = systemDictMapper.selectOne(systemDictQuery);
+
+ if (Objects.isNull(systemDict)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"瀛楀吀涓嶅瓨鍦�");
+ }
+ String jasonStr = Constants.toUnderlineJSONString(miniProgrammeDTO);
+ JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
+ parse.entrySet().forEach(s->{
+ UpdateWrapper<SystemDictData> wrapper = new UpdateWrapper<>();
+ wrapper.lambda()
+ .eq(SystemDictData::getDictId,systemDict.getId())
+ .eq(SystemDictData::getLabel,s.getKey().toUpperCase())
+ .set(SystemDictData::getCode,s.getValue());
+ systemDictDataMapper.update(null,wrapper);
+ });
+ } catch (JsonProcessingException e) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀛楀吀鍊艰В鏋愭湁璇�");
+ }
+ }
+
+ @Override
+ public LaborConfigDTO getLaborConfigDTO() {
+
+ try {
+ String jasonStr = Constants.toUnderlineJSONString(new LaborConfigDTO());
+ JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
+ List<String> collect = parse.entrySet().stream().map(s -> s.getKey().toUpperCase()).collect(Collectors.toList());
+
+ QueryWrapper<SystemDict> systemDictQuery = new QueryWrapper<>();
+ systemDictQuery.lambda()
+ .eq(SystemDict::getDeleted,Boolean.FALSE)
+ .eq(SystemDict::getCode,Constants.LABOR_CONFIG);
+ SystemDict systemDict = systemDictMapper.selectOne(systemDictQuery);
+
+ if (Objects.isNull(systemDict)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"瀛楀吀涓嶅瓨鍦�");
+ }
+ QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(SystemDictData::getDictId,systemDict.getId())
+ .in(SystemDictData::getLabel,collect);
+ List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
+ if (CollectionUtils.isEmpty(systemDictData)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"瀛楀吀鍊间笉瀛樺湪");
+ }
+ systemDictData.forEach(s->{
+ parse.put(s.getLabel().toLowerCase(),s.getCode());
+ });
+ String s = parse.toJSONString();
+ LaborConfigDTO miniProgrammeDTO = Constants.toSnakeObject(s, LaborConfigDTO.class);
+ return miniProgrammeDTO;
+ } catch (Exception e) {
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀛楀吀鍊艰В鏋愭湁璇�");
+ }
+ }
+
+ @Override
+ public void updateLaborConfigDTO(LaborConfigDTO miniProgrammeDTO) {
+ try {
+
+ QueryWrapper<SystemDict> systemDictQuery = new QueryWrapper<>();
+ systemDictQuery.lambda()
+ .eq(SystemDict::getDeleted,Boolean.FALSE)
+ .eq(SystemDict::getCode,Constants.VISIT_CONFIG);
+ SystemDict systemDict = systemDictMapper.selectOne(systemDictQuery);
+
+ if (Objects.isNull(systemDict)){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"瀛楀吀涓嶅瓨鍦�");
+ }
+ String jasonStr = Constants.toUnderlineJSONString(miniProgrammeDTO);
+ JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
+ parse.entrySet().forEach(s->{
+ UpdateWrapper<SystemDictData> wrapper = new UpdateWrapper<>();
+ wrapper.lambda()
+ .eq(SystemDictData::getDictId,systemDict.getId())
+ .eq(SystemDictData::getLabel,s.getKey().toUpperCase())
+ .set(SystemDictData::getCode,s.getValue());
+ systemDictDataMapper.update(null,wrapper);
+ });
+ } catch (JsonProcessingException e) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀛楀吀鍊艰В鏋愭湁璇�");
+ }
+ }
}
--
Gitblit v1.9.3