From a5a73bf1b545d38f6a82a811295a3deb1341e53a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 21 五月 2024 09:48:31 +0800
Subject: [PATCH] 最新版本
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 24 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java | 117 +++++++++++++++++++++--
server/system_service/src/main/java/com/doumee/config/cloudfilter/CustomHttpServletRequestWrapper.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java | 17 ++
server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java | 4
server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 41 +++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 30 ++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java | 6
12 files changed, 227 insertions(+), 28 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java b/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java
index 45a5047..832854b 100644
--- a/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java
+++ b/server/system_service/src/main/java/com/doumee/config/cloudfilter/CloudWebConfig.java
@@ -21,12 +21,12 @@
.addPathPatterns(Constants.CLOUD_SERVICE_URL_INDEX+"/**");
}
-// @Bean
+ @Bean
public FilterRegistrationBean addRequestWrapperFilter() {
FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<>();
registration.setFilter(new RequestWrapperFilter());
registration.setName("RequestWrapperFilter");
- registration.addUrlPatterns(Constants.CLOUD_SERVICE_URL_INDEX+"/*");
+ registration.addUrlPatterns(Constants.CLOUD_SERVICE_URL_INDEX+"/**");
registration.setOrder(1);
return registration;
}
diff --git a/server/system_service/src/main/java/com/doumee/config/cloudfilter/CustomHttpServletRequestWrapper.java b/server/system_service/src/main/java/com/doumee/config/cloudfilter/CustomHttpServletRequestWrapper.java
index 056137b..66f7f7a 100644
--- a/server/system_service/src/main/java/com/doumee/config/cloudfilter/CustomHttpServletRequestWrapper.java
+++ b/server/system_service/src/main/java/com/doumee/config/cloudfilter/CustomHttpServletRequestWrapper.java
@@ -10,8 +10,11 @@
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
+
+
public class CustomHttpServletRequestWrapper extends HttpServletRequestWrapper {
private String body;
+
public CustomHttpServletRequestWrapper(HttpServletRequest request ) {
super(request);
this.body = body;
diff --git a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
index bc48e9f..49e4f25 100644
--- a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
@@ -74,7 +74,7 @@
}
}
- /*try {
+ /* try {
CustomHttpServletRequestWrapper requestWrapper = (CustomHttpServletRequestWrapper)request;
String body = requestWrapper.getBody();
JSONObject object = JSONObject.parseObject(body);
@@ -83,7 +83,6 @@
requestWrapper.setBody( JSONObject.toJSONString(object));
}
}catch (Exception e){
- e.printStackTrace();
}*/
} else {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 0d50d69..f4c5706 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -11,6 +11,7 @@
import java.math.BigDecimal;
import java.net.URLDecoder;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -192,6 +193,29 @@
return s.substring(0,5)+"*******"+s.substring(l-6,l);
}
+ /**
+ * 鍒囧垎閫楀彿鎷兼帴鐨勬暣褰㈤泦鍚�
+ * @param memberIds
+ * @return
+ */
+
+ public static List<Integer> getIntegerListByStrs(String memberIds) {
+ List<Integer> idsList = null;
+ try {
+ String[] strs = memberIds.split(",");
+ for(String id :strs){
+ if(idsList == null){
+ idsList = new ArrayList<>();
+ }
+ idsList.add(Integer.parseInt(id));
+ }
+ }catch (Exception e){
+
+ }
+
+ return idsList;
+ }
+
/**
* mq tag
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
index 8d6c25a..9ad1b32 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
@@ -34,6 +34,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:hiddendanger:create")
public ApiResponse create(@RequestBody HiddenDanger hiddenDanger,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ hiddenDanger.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(hiddenDangerService.create(hiddenDanger));
}
@@ -57,6 +58,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:hiddendanger:update")
public ApiResponse updateById(@RequestBody HiddenDanger hiddenDanger,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ hiddenDanger.setLoginUserInfo(this.getLoginUser(token));
hiddenDangerService.updateById(hiddenDanger);
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
index c74d591..1a3be54 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
@@ -33,6 +33,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:hiddendangerparam:create")
public ApiResponse create(@RequestBody HiddenDangerParam hiddenDangerParam,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ hiddenDangerParam.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(hiddenDangerParamService.create(hiddenDangerParam));
}
@@ -40,7 +41,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:hiddendangerparam:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- hiddenDangerParamService.deleteById(id);
+ hiddenDangerParamService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -48,7 +49,7 @@
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:hiddendangerparam:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- hiddenDangerParamService.deleteByIdInBatch(this.getIdList(ids));
+ hiddenDangerParamService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -56,6 +57,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:hiddendangerparam:update")
public ApiResponse updateById(@RequestBody HiddenDangerParam hiddenDangerParam,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ hiddenDangerParam.setLoginUserInfo(this.getLoginUser(token));
hiddenDangerParamService.updateById(hiddenDangerParam);
return ApiResponse.success(null);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
index 71f37dc..8878ba9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.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 com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -93,4 +94,33 @@
@ExcelColumn(name="鍖哄煙鍚嶇О")
private String areaName;
+ @ApiModelProperty(value = "鐢宠浜哄鍚�", example = "1")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "鐢宠浜烘墍灞炵粍缁囧悕绉�", example = "1")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "鐢宠浜烘墜鏈哄彿", example = "1")
+ @TableField(exist = false)
+ private String memberPhone;
+ @ApiModelProperty(value = "澶勭悊浜哄鍚�", example = "1")
+ @TableField(exist = false)
+ private String checkorName;
+ @ApiModelProperty(value = "澶勭悊浜烘墍灞炵粍缁囧悕绉�", example = "1")
+ @TableField(exist = false)
+ private String checkorCompanyName;
+ @ApiModelProperty(value = "澶勭悊浜烘墜鏈哄彿", example = "1")
+ @TableField(exist = false)
+ private String checkorPhone;
+ @ApiModelProperty(value = "闅愭偅绫诲瀷鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String categoryName;
+
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:50")
+ @TableField(exist = false)
+ private Date queryStartTime;
+ @ApiModelProperty(value = "鏌ヨ鎴濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:46")
+ @TableField(exist = false)
+ private Date queryEndTime;
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
index 3836f49..c5b3557 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
@@ -70,7 +70,7 @@
@ApiModelProperty(value = "瀹夊叏鍛樼紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1")
@ExcelColumn(name="瀹夊叏鍛樼紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- private Integer memberIds;
+ private String memberIds;
@ApiModelProperty(value = "瀹夊叏鍛樺鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
@ExcelColumn(name="瀹夊叏鍛樺鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java
index 9c18753..a37234c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerParamService.java
@@ -1,5 +1,7 @@
package com.doumee.service.business;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.LoginUserModel;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.HiddenDangerParam;
@@ -25,7 +27,7 @@
*
* @param id 涓婚敭
*/
- void deleteById(Integer id);
+ void deleteById(Integer id, LoginUserInfo userInfo);
/**
* 鍒犻櫎
@@ -39,7 +41,7 @@
*
* @param ids 涓婚敭闆�
*/
- void deleteByIdInBatch(List<Integer> ids);
+ void deleteByIdInBatch(List<Integer> ids, LoginUserInfo userInfo);
/**
* 涓婚敭鏇存柊
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
index 0932412..1271993 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -1,19 +1,28 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+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.business.ApproveTemplMapper;
+import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.ApproveTempl;
+import com.doumee.dao.business.model.CarDriver;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ApproveTemplService;
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 org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
/**
@@ -26,11 +35,13 @@
@Autowired
private ApproveTemplMapper approveTemplMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Override
- public Integer create(ApproveTempl approveTempl) {
- approveTemplMapper.insert(approveTempl);
- return approveTempl.getId();
+ public Integer create(ApproveTempl model) {
+ approveTemplMapper.insert(model);
+ return model.getId();
}
@Override
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
index a096272..437393f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -1,19 +1,30 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+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.business.HiddenDangerParamMapper;
+import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.model.CarDriver;
import com.doumee.dao.business.model.HiddenDangerParam;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.HiddenDangerParamService;
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 io.swagger.models.auth.In;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
/**
@@ -23,19 +34,62 @@
*/
@Service
public class HiddenDangerParamServiceImpl implements HiddenDangerParamService {
-
@Autowired
private HiddenDangerParamMapper hiddenDangerParamMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Override
- public Integer create(HiddenDangerParam hiddenDangerParam) {
- hiddenDangerParamMapper.insert(hiddenDangerParam);
- return hiddenDangerParam.getId();
+ public Integer create(HiddenDangerParam model) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = model.getLoginUserInfo();
+ }
+ if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
+ //濡傛灉鏄尯鍩熼厤缃�
+ List<Integer> ids = Constants.getIntegerListByStrs(model.getMemberIds());
+ if(ids==null || ids.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀹夊叏鍛樹俊鎭笉姝ｇ‘锛岃鎸夎姹傚～鍐欏唴瀹癸紒");
+ }
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .eq(Member::getType,Constants.TWO)
+ .eq(Member::getIsdeleted,Constants.ZERO));
+ if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勫畨鍏ㄥ憳淇℃伅锛�");
+ }
+ String names = null;
+ String idss = null;
+ for(Member member : memberList){
+ if(StringUtils.isNotBlank(names)){
+ names += ",";
+ }
+ if(StringUtils.isNotBlank(idss)){
+ idss += ",";
+ }
+ names += member.getName();
+ names += member.getId();
+ }
+ model.setMemberNames(names);
+ model.setMemberIds(idss);
+ }
+ model.setType(Constants.formatIntegerNum(model.getType()));
+ model.setCreateDate(new Date());
+ model.setCreator(loginUserInfo.getId());
+ model.setEditDate(new Date());
+ model.setEditor(loginUserInfo.getId());
+ model.setStatus(Constants.ZERO);
+ hiddenDangerParamMapper.insert(model);
+ return model.getId();
}
@Override
- public void deleteById(Integer id) {
- hiddenDangerParamMapper.deleteById(id);
+ public void deleteById(Integer id, LoginUserInfo userInfo) {
+ HiddenDangerParam model = new HiddenDangerParam();
+ model.setEditDate(new Date());
+ model.setEditor(userInfo.getId());
+ model.setId(id);
+ model.setIsdeleted(Constants.ONE);
+ hiddenDangerParamMapper.updateById(model);
}
@Override
@@ -45,16 +99,57 @@
}
@Override
- public void deleteByIdInBatch(List<Integer> ids) {
+ public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo userInfo) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
- hiddenDangerParamMapper.deleteBatchIds(ids);
+ for(Integer id :ids){
+ deleteById(id,userInfo);
+ }
}
@Override
- public void updateById(HiddenDangerParam hiddenDangerParam) {
- hiddenDangerParamMapper.updateById(hiddenDangerParam);
+ public void updateById(HiddenDangerParam model) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(loginUserInfo == null){
+ loginUserInfo = model.getLoginUserInfo();
+ }
+ HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(model.getId());
+ if(hiddenDangerParam == null || Constants.equalsObject(hiddenDangerParam.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ラ厤缃俊鎭笉瀛樺湪锛岃杩斿洖鍒锋柊椤甸潰閲嶈瘯锛�");
+ }
+ if(Constants.equalsInteger(hiddenDangerParam.getType(),Constants.ZERO)){
+ //濡傛灉鏄尯鍩熼厤缃�,鏍￠獙瀹夊叏鍛樹俊鎭槸鍚︽纭�
+ List<Integer> ids = Constants.getIntegerListByStrs(model.getMemberIds());
+ if(ids==null || ids.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀹夊叏鍛樹俊鎭笉姝ｇ‘锛岃鎸夎姹傚～鍐欏唴瀹癸紒");
+ }
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .eq(Member::getType,Constants.TWO)
+ .eq(Member::getIsdeleted,Constants.ZERO));
+ if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勫畨鍏ㄥ憳淇℃伅锛�");
+ }
+ String names = null;
+ String idss = null;
+ for(Member member : memberList){
+ if(StringUtils.isNotBlank(names)){
+ names += ",";
+ }
+ if(StringUtils.isNotBlank(idss)){
+ idss += ",";
+ }
+ names += member.getName();
+ names += member.getId();
+ }
+ model.setMemberNames(names);
+ model.setMemberIds(idss);
+ }
+ model.setType(Constants.formatIntegerNum(model.getType()));
+ model.setEditDate(new Date());
+ model.setEditor(loginUserInfo.getId());
+ model.setStatus(Constants.ZERO);
+ hiddenDangerParamMapper.updateById(model);
}
@Override
@@ -89,6 +184,7 @@
IPage<HiddenDangerParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<HiddenDangerParam> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
queryWrapper.lambda()
.eq(pageWrap.getModel().getId() != null, HiddenDangerParam::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, HiddenDangerParam::getCreator, pageWrap.getModel().getCreator())
@@ -106,6 +202,7 @@
.eq(pageWrap.getModel().getMemberIds() != null, HiddenDangerParam::getMemberIds, pageWrap.getModel().getMemberIds())
.eq(pageWrap.getModel().getMemberNames() != null, HiddenDangerParam::getMemberNames, pageWrap.getModel().getMemberNames())
.eq(pageWrap.getModel().getType() != null, HiddenDangerParam::getType, pageWrap.getModel().getType())
+ .orderByDesc(HiddenDangerParam::getCreateDate)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 7fee8ac..d1351e6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -1,20 +1,30 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+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.business.HiddenDangerMapper;
-import com.doumee.dao.business.model.HiddenDanger;
+import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.HiddenDangerService;
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.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 闅愭偅淇℃伅琛⊿ervice瀹炵幇
@@ -26,11 +36,14 @@
@Autowired
private HiddenDangerMapper hiddenDangerMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Override
- public Integer create(HiddenDanger hiddenDanger) {
- hiddenDangerMapper.insert(hiddenDanger);
- return hiddenDanger.getId();
+ public Integer create(HiddenDanger model) {
+
+ hiddenDangerMapper.insert(model);
+ return model.getId();
}
@Override
@@ -87,9 +100,20 @@
@Override
public PageData<HiddenDanger> findPage(PageWrap<HiddenDanger> pageWrap) {
IPage<HiddenDanger> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<HiddenDanger> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<HiddenDanger> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.lambda()
+ queryWrapper.selectAll(HiddenDanger.class)
+ .selectAs(HiddenDangerParam::getName,HiddenDanger::getCategoryName)
+ .select("t1.name", HiddenDanger::getMemberName)
+ .select("t1.phone",HiddenDanger::getMemberPhone)
+ .select("t2.name",HiddenDanger::getCheckorName)
+ .select("t3.phone",HiddenDanger::getCheckorPhone)
+ .select("t4.company_name_path",HiddenDanger::getCompanyName);
+ queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
+ .leftJoin("company t4 on t1.company_id=t4.id")
+ .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
+ .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId);
+ queryWrapper
.eq(pageWrap.getModel().getId() != null, HiddenDanger::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, HiddenDanger::getCreator, pageWrap.getModel().getCreator())
.ge(pageWrap.getModel().getCreateDate() != null, HiddenDanger::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
@@ -110,6 +134,11 @@
.eq(pageWrap.getModel().getChecklInfo() != null, HiddenDanger::getChecklInfo, pageWrap.getModel().getChecklInfo())
.eq(pageWrap.getModel().getCheckUserId() != null, HiddenDanger::getCheckUserId, pageWrap.getModel().getCheckUserId())
.eq(pageWrap.getModel().getAreaName() != null, HiddenDanger::getAreaName, pageWrap.getModel().getAreaName())
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
+ .or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
+ .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), Empower::getCreateDate,pageWrap.getModel().getQueryStartTime())
+ .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),Empower::getCreateDate,pageWrap.getModel().getQueryEndTime())
+ .orderByDesc(Visits::getCreateDate)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
--
Gitblit v1.9.3