list = BeanUtil.copyToList(volist, TestDemo.class);
iTestDemoService.saveBatch(list);
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
index 1b729ef1b..a66dada79 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -41,5 +41,5 @@ spring.boot.admin.client:
url: http://localhost:9090/admin
instance:
service-host-type: IP
- username: ruoyi
- password: 123456
+ username: gaoxin
+ password: 1234Qwer@
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java
index 0be6ba663..7bacf3080 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java
@@ -25,4 +25,4 @@ public class WebMvcConfig implements WebMvcConfigurer {
registry.addInterceptor(cookieInterceptor).addPathPatterns("/**");
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-file/pom.xml b/ruoyi-file/pom.xml
index 807c6da27..6a99cc729 100644
--- a/ruoyi-file/pom.xml
+++ b/ruoyi-file/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 4.7.0
+ 4.8.0
4.0.0
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index a8697d27d..ceb1de4fb 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -39,9 +39,6 @@ public class ResourcesConfig implements WebMvcConfigurer {
registry.addInterceptor(new PlusWebInvokeTimeInterceptor());
}
- /* @Override
- public void addResourceHandlers(ResourceHandlerRegistry registry) {
- }*/
/**
* 跨域配置
@@ -83,8 +80,9 @@ public class ResourcesConfig implements WebMvcConfigurer {
public void addCorsMappings(CorsRegistry registry) {
// 设置允许跨域的路由
registry.addMapping(localFilePrefix + "/**")
- // 设置允许跨域请求的域名
.allowedOrigins("*")
+ .allowCredentials(true)
+ .maxAge(3000)
// 设置允许的方法
.allowedMethods("GET");
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java
index 78bffab4f..71498ed14 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java
@@ -3,6 +3,7 @@ package com.ruoyi.framework.interceptor;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.map.MapUtil;
import com.alibaba.ttl.TransmittableThreadLocal;
+import com.ruoyi.common.core.service.ConfigService;
import com.ruoyi.common.filter.RepeatedlyRequestWrapper;
import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -34,6 +35,7 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+// response.sendRedirect("https://dbxqtalents.cn/");
if (!prodProfile.equals(SpringUtils.getActiveProfile())) {
String url = request.getMethod() + " " + request.getRequestURI();
@@ -59,6 +61,10 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
invokeTimeTL.set(stopWatch);
stopWatch.start();
}
+ //判断系统是否在维护中
+ ConfigService sysConfigService = SpringUtils.getBean(ConfigService.class);
+ //系统升级提示
+ sysConfigService.selectConfigByConfigKey("system:maintenance:prompt");
return true;
}
diff --git a/ruoyi-rabbitmq/pom.xml b/ruoyi-rabbitmq/pom.xml
index 1f8f03be9..917346d38 100644
--- a/ruoyi-rabbitmq/pom.xml
+++ b/ruoyi-rabbitmq/pom.xml
@@ -5,7 +5,7 @@
ruoyi-vue-plus
com.ruoyi
- 4.7.0
+ 4.8.0
4.0.0
jar
diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/entity/SmsResult.java b/ruoyi-sms/src/main/java/com/ruoyi/sms/entity/SmsResult.java
new file mode 100644
index 000000000..89c39b403
--- /dev/null
+++ b/ruoyi-sms/src/main/java/com/ruoyi/sms/entity/SmsResult.java
@@ -0,0 +1,31 @@
+package com.ruoyi.sms.entity;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * 上传返回体
+ *
+ * @author Lion Li
+ */
+@Data
+@Builder
+public class SmsResult {
+
+ /**
+ * 是否成功
+ */
+ private boolean isSuccess;
+
+ /**
+ * 响应消息
+ */
+ private String message;
+
+ /**
+ * 实际响应体
+ *
+ * 可自行转换为 SDK 对应的 SendSmsResponse
+ */
+ private String response;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/PushLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PushLog.java
new file mode 100644
index 000000000..ca4cad2d5
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/PushLog.java
@@ -0,0 +1,39 @@
+package com.ruoyi.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 推送日志对象 push_log
+ *
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("push_log")
+public class PushLog extends BaseEntity {
+
+ private static final long serialVersionUID=1L;
+
+ /**
+ *
+ */
+ @TableId(value = "id",type = IdType.AUTO)
+ private Long id;
+ /**
+ * 推送数据
+ */
+ private String pushData;
+ /**
+ * 返回结果
+ */
+ private String resultData;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/HousesReviewBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/HousesReviewBo.java
index da9542436..854717bbd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/HousesReviewBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/HousesReviewBo.java
@@ -99,7 +99,7 @@ public class HousesReviewBo extends BaseEntity {
/**
* 资格预申请时间
*/
- @NotBlank(message = "资格预申请时间不能为空", groups = { AddGroup.class, EditGroup.class })
+// @NotBlank(message = "资格预申请时间不能为空", groups = { AddGroup.class, EditGroup.class })
private String qualificationPreApplyTime;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/PushLogBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/PushLogBo.java
new file mode 100644
index 000000000..fcc31f4c1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/PushLogBo.java
@@ -0,0 +1,43 @@
+package com.ruoyi.system.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 推送日志业务对象 push_log
+ *
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PushLogBo extends BaseEntity {
+
+ /**
+ *
+ */
+ @NotNull(message = "不能为空", groups = { EditGroup.class })
+ private Long id;
+
+ /**
+ * 推送数据
+ */
+ @NotBlank(message = "推送数据不能为空", groups = { AddGroup.class, EditGroup.class })
+ private String pushData;
+
+ /**
+ * 返回结果
+ */
+ @NotBlank(message = "返回结果不能为空", groups = { AddGroup.class, EditGroup.class })
+ private String resultData;
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/HousesReviewVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/HousesReviewVo.java
index af92c615d..4295e8a8f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/HousesReviewVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/HousesReviewVo.java
@@ -38,6 +38,9 @@ public class HousesReviewVo implements Serializable {
private Long id;
private String step;
+
+ @ExcelProperty(value = "序号")
+ private String number;
/**
* 证件类型
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PushLogVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PushLogVo.java
new file mode 100644
index 000000000..22f189071
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PushLogVo.java
@@ -0,0 +1,37 @@
+package com.ruoyi.system.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 推送日志视图对象 push_log
+ *
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class PushLogVo {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 推送数据
+ */
+ @ExcelProperty(value = "推送数据")
+ private String pushData;
+
+ /**
+ * 返回结果
+ */
+ @ExcelProperty(value = "返回结果")
+ private String resultData;
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PushLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PushLogMapper.java
new file mode 100644
index 000000000..83ff1ca2d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/PushLogMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.PushLog;
+import com.ruoyi.system.domain.vo.PushLogVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 推送日志Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public interface PushLogMapper extends BaseMapperPlus {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IPushLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IPushLogService.java
new file mode 100644
index 000000000..9b953475c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IPushLogService.java
@@ -0,0 +1,45 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.common.core.domain.event.PushLogEvent;
+import com.ruoyi.system.domain.vo.PushLogVo;
+import com.ruoyi.system.domain.bo.PushLogBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 推送日志Service接口
+ *
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+public interface IPushLogService {
+
+ /**
+ * 查询推送日志
+ */
+ PushLogVo queryById(Long id);
+
+ /**
+ * 查询推送日志列表
+ */
+ TableDataInfo queryPageList(PushLogBo bo, PageQuery pageQuery);
+
+ /**
+ * 查询推送日志列表
+ */
+ List queryList(PushLogBo bo);
+
+
+ /**
+ * 修改推送日志
+ */
+ Boolean updateByBo(PushLogBo bo);
+
+ /**
+ * 校验并批量删除推送日志信息
+ */
+ Boolean deleteWithValidByIds(Collection ids, Boolean isValid);
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserService.java
index 2d2973614..b09d966b0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserService.java
@@ -57,5 +57,4 @@ public interface IUserService {
*/
int resetUserPwd(String userName, String password);
- R getUserCandidateInfo(String cardId) throws Exception;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
index c1d30516a..8e3c15a30 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
@@ -93,8 +93,6 @@ public class SysLoginService {
SysUser user = loadSysUserByUsername(username);
checkLogin(LoginType.PASSWORD, username, () -> !BCrypt.checkpw(password, user.getPassword()));
// 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
- LoginUser loginUser = buildLoginUser(user);
- // 此处可根据登录用户的数据不同 自行创建 loginUser
LoginUser loginUser = buildLoginSysUser(user);
// 生成token
LoginHelper.loginByDevice(loginUser, DeviceType.PC);
@@ -110,10 +108,6 @@ public class SysLoginService {
checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phonenumber, smsCode,CacheConstants.CAPTCHA_CODE_KEY));
// 此处可根据登录用户的数据不同 自行创建 loginUser
LoginUser loginUser = buildLoginSysUser(user);
-
- checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phonenumber, smsCode));
- // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
- LoginUser loginUser = buildLoginUser(user);
// 生成token
LoginHelper.loginByDevice(loginUser, DeviceType.APP);
@@ -358,7 +352,7 @@ public class SysLoginService {
} else {
// 未达到规定错误次数
recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber));
- throw new UserException(loginType.getRetryLimitCount(), errorNumber);
+ throw new UserException(loginType.getRetryLimitCount(), errorNumber,maxRetryCount-errorNumber);
}
}
// 登录成功 清空错误次数
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java
index ec8b9fe01..223bb7527 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BuyHousesServiceImpl.java
@@ -156,7 +156,7 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
private LambdaQueryWrapper buildQueryWrapper(BuyHousesBo bo) {
Map params = bo.getParams();
LambdaQueryWrapper lqw = Wrappers.lambdaQuery();
- if (ObjectUtil.isNotNull(bo.getIds())){
+ if (ObjectUtil.isNotNull(bo.getIds()) && bo.getIds().length>0){
lqw.in(BuyHouses::getId,bo.getIds());
}
lqw.eq(ObjectUtil.isNotNull(bo.getId()), BuyHouses::getId, bo.getId());
@@ -227,12 +227,12 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
lqw.eq(StringUtils.isNotBlank(bo.getSocialSecurityUrl()), BuyHouses::getSocialSecurityUrl, bo.getSocialSecurityUrl());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), BuyHouses::getStatus, bo.getStatus());
lqw.eq(bo.getUserId() != null, BuyHouses::getUserId, bo.getUserId());
-
lqw.eq(StringUtils.isNotBlank(bo.getProcessStatus()),BuyHouses::getProcessStatus,bo.getProcessStatus());
lqw.ge(StringUtils.isBlank(bo.getProcessStatus()),BuyHouses::getProcessStatus,Constants.SUCCEED);
- lqw.and(StringUtils.isNotBlank(bo.getUserName()),t ->t.like(BuyHouses::getUserName,bo.getUserName())
- .or().like(BuyHouses::getPhone,bo.getUserName())
- .or().like(BuyHouses::getCardId,bo.getUserName()));
+ lqw.and(StringUtils.isNotBlank(bo.getUserName()),t ->
+ t.like(BuyHouses::getUserName,bo.getUserName())
+ .or().like(BuyHouses::getPhone,bo.getUserName())
+ .or().like(BuyHouses::getCardId,bo.getUserName()));
lqw.eq(StringUtils.isNotBlank(bo.getDistrict()),BuyHouses::getDistrict,bo.getDistrict());
lqw.like(StringUtils.isNotBlank(bo.getType()),BuyHouses::getType,bo.getType());
@@ -489,7 +489,7 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
R rInfo = OpenUtils.getGaoXinCardInfo(buyHouses.getCardId());
GaoXinCardInfo gaoXinCardInfo = JsonUtils.parseObject(JSONUtil.toJsonPrettyStr(rInfo.getData()), GaoXinCardInfo.class);
BuyHouses buyHousesDto = new BuyHouses();
- buyHousesDto.setCardId(gaoXinCardInfo.getCard_id());
+ buyHousesDto.setCardId(StringUtils.toUpperCase(gaoXinCardInfo.getCard_id()));
String nationality = gaoXinCardInfo.getNationality();
if ("中国".contains(nationality)){
buyHousesDto.setNationality("中国籍");
@@ -532,33 +532,6 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
hashMap.put("processKey","apply_house");
hashMap.put("businessId",null);
return R.ok("获取成功",hashMap);
-
-
- /* HttpResponse execute = HttpRequest.get(URL)
- .form("cardId",cardId)
- .timeout(5000)
- .execute();
- JSONObject entries = JSONUtil.parseObj(execute.body());
- String code = String.valueOf(entries.get("code"));
- if (ObjectUtil.isNull(code)){
- return R.fail("获取人才信息失败");
- }else {
- if ("666666".equals(code)){
- BuyHouses buyHouses = baseMapper.selectOne(new LambdaQueryWrapper<>(BuyHouses.class).eq(BuyHouses::getCardId, cardId));
- if (ObjectUtil.isNotNull(buyHouses)){
- hashMap.put("status",buyHouses.getProcessStatus());
- hashMap.put("processKey",buyHouses.getProcessKey());
- hashMap.put("businessId",buyHouses.getId());
- return R.ok("获取成功",hashMap);
- }
- hashMap.put("status",Constants.SUBMIT);
- hashMap.put("processKey","apply_house");
- hashMap.put("businessId",null);
- return R.ok("获取成功",hashMap);
- }else {
- return R.fail("暂无资格");
- }
- }*/
}
/**
@@ -1325,7 +1298,7 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
public void excelZip(String id){
BuyHousesBo bo =new BuyHousesBo();
if (ObjectUtil.isNotNull(id)){
- bo.setId(Long.valueOf(id));
+ bo.setId(Long.valueOf(id));
}
LambdaQueryWrapper lqw = buildQueryWrapper(bo);
List buyHousesVoList = baseMapper.selectVoList(lqw);
@@ -1467,9 +1440,9 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
Map map = WorkUtils.getInfoToMap("buy_houses",id);
String virtualcode = String.valueOf(map.get("virtualcode"));
map.put("virtualcode", virtualcode == "3" ? "010" : "009");
- String cardType = String.valueOf(map.get("cardType"));
+ String cardType = String.valueOf(map.get("nationality"));
map.put("cardType", "中国籍".equals(cardType) ? 1 : 4);
- Object createTime = map.get("createTime");
+ Object createTime = map.get("passTime");
SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH);
DateFormat cst = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date format = sdf.parse(createTime.toString());
@@ -1495,7 +1468,6 @@ public class BuyHousesServiceImpl implements IBuyHousesService {
map.put("cardId",buyHouses.getCardId());
map.put("cancelTime", DateUtils.dateTime("yyyy-MM-dd HH:mm:ss"));
map.put("note","人才主动撤销");//备注
- map.put("status", "00N");
System.out.println("JSONUtil.toJsonPrettyStr(map) = " + JSONUtil.toJsonPrettyStr(map));
housingConstructionBureauPushDto.openUrl("https://jcfw.cdzjryb.com/CCSRegistryCenter/rest",map,"254");//正式
return null;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java
index b106369f2..3658e6d62 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HousesReviewServiceImpl.java
@@ -117,7 +117,7 @@ public class HousesReviewServiceImpl implements IHousesReviewService {
private LambdaQueryWrapper buildQueryWrapper3(HousesReviewBo bo) {
Map params = bo.getParams();
LambdaQueryWrapper lqw = Wrappers.lambdaQuery();
- if (ObjectUtil.isNotNull(bo.getIds())){
+ if (ObjectUtil.isNotNull(bo.getIds()) && bo.getIds().length>0){
lqw.in(HousesReview::getId,bo.getIds());
}
lqw.and(StringUtils.isNotBlank(bo.getName()),t ->
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PushLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PushLogServiceImpl.java
new file mode 100644
index 000000000..8c5d0fab9
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PushLogServiceImpl.java
@@ -0,0 +1,109 @@
+package com.ruoyi.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.core.domain.event.PushLogEvent;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.domain.bo.PushLogBo;
+import com.ruoyi.system.domain.vo.PushLogVo;
+import com.ruoyi.system.domain.PushLog;
+import com.ruoyi.system.mapper.PushLogMapper;
+import com.ruoyi.system.service.IPushLogService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 推送日志Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-07-20
+ */
+@RequiredArgsConstructor
+@Service
+public class PushLogServiceImpl implements IPushLogService {
+
+ private final PushLogMapper baseMapper;
+
+ /**
+ * 查询推送日志
+ */
+ @Override
+ public PushLogVo queryById(Long id){
+ return baseMapper.selectVoById(id);
+ }
+
+ /**
+ * 查询推送日志列表
+ */
+ @Override
+ public TableDataInfo queryPageList(PushLogBo bo, PageQuery pageQuery) {
+ LambdaQueryWrapper lqw = buildQueryWrapper(bo);
+ Page result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+ return TableDataInfo.build(result);
+ }
+
+ /**
+ * 查询推送日志列表
+ */
+ @Override
+ public List queryList(PushLogBo bo) {
+ LambdaQueryWrapper lqw = buildQueryWrapper(bo);
+ return baseMapper.selectVoList(lqw);
+ }
+
+ private LambdaQueryWrapper buildQueryWrapper(PushLogBo bo) {
+ Map params = bo.getParams();
+ LambdaQueryWrapper lqw = Wrappers.lambdaQuery();
+ lqw.eq(StringUtils.isNotBlank(bo.getPushData()), PushLog::getPushData, bo.getPushData());
+ lqw.eq(StringUtils.isNotBlank(bo.getResultData()), PushLog::getResultData, bo.getResultData());
+ return lqw;
+ }
+
+ /**
+ * 新增推送日志
+ */
+ @Async
+ @EventListener
+ public void insertByBo(PushLogEvent event) {
+ PushLog add = BeanUtil.toBean(event, PushLog.class);
+ baseMapper.insert(add);
+ }
+
+ /**
+ * 修改推送日志
+ */
+ @Override
+ public Boolean updateByBo(PushLogBo bo) {
+ PushLog update = BeanUtil.toBean(bo, PushLog.class);
+ validEntityBeforeSave(update);
+ return baseMapper.updateById(update) > 0;
+ }
+
+ /**
+ * 保存前的数据校验
+ */
+ private void validEntityBeforeSave(PushLog entity){
+ //TODO 做一些数据校验,如唯一约束
+ }
+
+ /**
+ * 批量删除推送日志
+ */
+ @Override
+ public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) {
+ if(isValid){
+ //TODO 做一些业务上的校验,判断是否需要校验
+ }
+ return baseMapper.deleteBatchIds(ids) > 0;
+ }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SubscribeExportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SubscribeExportServiceImpl.java
index 9bc9bbf17..d03b3a27c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SubscribeExportServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SubscribeExportServiceImpl.java
@@ -57,7 +57,9 @@ public class SubscribeExportServiceImpl implements ISubscribeExportService {
*/
@Override
public TableDataInfo queryPageList(SubscribeExportBo bo, PageQuery pageQuery) {
- bo.setUserId(LoginHelper.getUserId().toString());
+ if (!LoginHelper.isAdmin()){
+ bo.setUserId(LoginHelper.getUserId().toString());
+ }
bo.setExportStatus("1");
LambdaQueryWrapper lqw = buildQueryWrapper(bo);
lqw.orderByDesc(SubscribeExport::getCreateTime);
@@ -78,6 +80,7 @@ public class SubscribeExportServiceImpl implements ISubscribeExportService {
Map params = bo.getParams();
LambdaQueryWrapper lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getPath()), SubscribeExport::getPath, bo.getPath());
+ lqw.eq(StringUtils.isNotBlank(bo.getExportStatus()), SubscribeExport::getExportStatus, bo.getExportStatus());
lqw.eq(StringUtils.isNotBlank(bo.getUserId()), SubscribeExport::getUserId, bo.getUserId());
lqw.eq(StringUtils.isNotBlank(bo.getProcessKey()), SubscribeExport::getProcessKey, bo.getProcessKey());
return lqw;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index e47be3f15..e94366391 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -6,11 +6,13 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.CacheNames;
+import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.service.ConfigService;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.redis.CacheUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -21,7 +23,10 @@ import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -69,12 +74,11 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
*/
@Override
public void selectConfigByConfigKey(String key) {
- SysConfig aTrue = baseMapper.selectOne(new LambdaQueryWrapper<>(SysConfig.class)
- .eq(SysConfig::getConfigKey, key)
- .eq(SysConfig::getConfigValue, "true"));
- if (ObjectUtil.isNotNull(aTrue)){
- throw new ServiceException(aTrue.getRemark());
+ String s = selectConfigByKey(key);
+ if ("true".equals(s)){
+ throw new ServiceException("系统升级维护中!感谢您的等待!");
}
+ System.out.println("s = " + s);
}
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index 6aa308afa..8af6cabdb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -23,7 +23,6 @@ import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.work.service.IWorkSysDeptService;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
@@ -40,7 +39,7 @@ import java.util.List;
*/
@RequiredArgsConstructor
@Service
-public class SysDeptServiceImpl implements ISysDeptService, DeptService, IWorkSysDeptService {
+public class SysDeptServiceImpl implements ISysDeptService, DeptService {
private final SysDeptMapper baseMapper;
private final SysRoleMapper roleMapper;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 076e59be6..aad38645c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -26,7 +26,6 @@ import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysRoleMenuMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.work.service.IWorkSysRoleService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -40,7 +39,7 @@ import java.util.*;
*/
@RequiredArgsConstructor
@Service
-public class SysRoleServiceImpl implements ISysRoleService, IWorkSysRoleService {
+public class SysRoleServiceImpl implements ISysRoleService{
private final SysRoleMapper baseMapper;
private final SysRoleMenuMapper roleMenuMapper;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index d8c24c690..fd4dcc19f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -27,7 +27,6 @@ import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.work.service.IWorkSysUserService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cache.annotation.Cacheable;
@@ -46,7 +45,7 @@ import java.util.Map;
@Slf4j
@RequiredArgsConstructor
@Service
-public class SysUserServiceImpl implements ISysUserService, UserService, IWorkSysUserService {
+public class SysUserServiceImpl implements ISysUserService, UserService{
private final SysUserMapper baseMapper;
private final SysDeptMapper deptMapper;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
index f5d3e6bdf..5ff753bc7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.http.HttpRequest;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.AesUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
@@ -144,22 +142,4 @@ public class UserServiceImpl implements IUserService {
.set(User::getPassword, password)
.eq(User::getLoginName, userName));
}
-
- @Override
- public R getUserCandidateInfo(String cardId) throws Exception {
- LinkedHashMap hashMap = new LinkedHashMap<>();
- hashMap.put("loginName",AesUtil.decryptBASE64("18716148446"));
- hashMap.put("password",AesUtil.decryptBASE64("1234Qwer"));
- try {
- HttpRequest.post("https://gx.chengdutalent.cn:8010/user/login")
- .form(hashMap)
- .timeout(20000)
- .execute().body();
- } catch (Exception e) {
- throw new RuntimeException("调用接口超时");
- }
- //调用高新的接口
- return null;
-
- }
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/PushLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/PushLogMapper.xml
new file mode 100644
index 000000000..67d766faa
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/PushLogMapper.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index e73e715db..9945adf9f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -24,6 +24,7 @@
+
@@ -65,6 +66,7 @@
u.create_by,
u.create_time,
u.remark,
+ u.properties,
d.dept_id,
d.parent_id,
d.ancestors,
@@ -85,7 +87,7 @@