From d7bfd8dadd802a55225f9d5ea2ecb92c02b7dcce Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 17 四月 2024 12:28:27 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 2 +-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 4 ++--
ruoyi-ui/src/api/monitor/logininfor.js | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 36 ++++++++++++++++++++----------------
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml | 6 ++++--
5 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index 567389a..49727dd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -180,7 +180,7 @@
Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
@Override
public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) {
- return o1.getCreateTime().compareTo(o2.getCreateTime());
+ return o1.getApplyTime().compareTo(o2.getApplyTime());
}
});
return getCustomDataTable(list, pageNum, pageSize);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 90c1fa5..b895f1a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -2,13 +2,20 @@
import java.util.List;
import java.util.Set;
+import java.util.UUID;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.model.LoginBodyByOpenID;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.config.RabbitMqConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
+import org.springframework.amqp.AmqpException;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessagePostProcessor;
+import org.springframework.amqp.rabbit.connection.CorrelationData;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.constant.Constants;
@@ -23,13 +30,12 @@
/**
* 鐧诲綍楠岃瘉
- *
+ *
* @author ruoyi
*/
@Api("鐢ㄦ埛鐧诲綍")
@RestController
-public class SysLoginController
-{
+public class SysLoginController {
@Autowired
private SysLoginService loginService;
@@ -39,6 +45,8 @@
@Autowired
private SysPermissionService permissionService;
+ @Autowired
+ private RabbitTemplate rabbitTemplate;
/**
@@ -50,9 +58,8 @@
@ApiOperation("寰俊OpenID鐧诲綍")
@ApiImplicitParam(name = "loginBody", value = "鐧诲綍淇℃伅", dataType = "LoginBodyByOpenID")
@PostMapping("/openidlogin")
- public AjaxResult openidLogin(@RequestBody LoginBodyByOpenID loginBody)
- {
- String openid=loginBody.getOpenid();
+ public AjaxResult openidLogin(@RequestBody LoginBodyByOpenID loginBody) {
+ String openid = loginBody.getOpenid();
AjaxResult ajax = loginService.wxopenidLogin(openid);
return ajax;
}
@@ -60,19 +67,17 @@
/**
* 鐧诲綍鏂规硶
- *
+ *
* @param loginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
@ApiOperation("鐧诲綍淇℃伅")
@Log(title = "鐧诲綍淇℃伅", businessType = BusinessType.OTHER)
@PostMapping("/login")
- public AjaxResult login(@RequestBody LoginBody loginBody)
- {
+ public AjaxResult login(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
- loginBody.getUuid(), loginBody.getOpenid());
+ String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOpenid());
ajax.put(Constants.TOKEN, token);
return ajax;
@@ -81,12 +86,11 @@
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
- *
+ *
* @return 鐢ㄦ埛淇℃伅
*/
@GetMapping("getInfo")
- public AjaxResult getInfo()
- {
+ public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getUser();
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
@@ -104,11 +108,11 @@
/**
* 鑾峰彇璺敱淇℃伅
* /addOrUpdateRBpayee/addOrUpdateRBpayee/addOrUpdateRBpayee
+ *
* @return 璺敱淇℃伅
*/
@GetMapping("getRouters")
- public AjaxResult getRouters()
- {
+ public AjaxResult getRouters() {
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return AjaxResult.success(menuService.buildMenus(menus));
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
index 750f9f0..81e4056 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
@@ -139,7 +139,8 @@
where reimid = #{RemId} and del_flag!=1
</select>
- <select id="selectServiceReimbursementSharedList" parameterType="com.ruoyi.project.domain.ServiceReimbursementShared"
+ <select id="selectServiceReimbursementSharedList"
+ parameterType="com.ruoyi.project.domain.ServiceReimbursementShared"
resultMap="ServiceReimbursementSharedResult">
<include refid="selectServiceReimbursementSharedVo"/>
<where>
@@ -199,7 +200,8 @@
<update id="delResharedInfoById">
UPDATE service_reimbursement_shared
- SET del_flag = 1
+ SET del_flag = 1,
+ update_time = sysdate()
WHERE id = #{id}
and del_flag != 1
</update>
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 6b8b5a6..83bef1a 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -308,8 +308,8 @@
}
//灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎
- serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
-
+ Boolean aBoolean = serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId());
+ log.info("灏嗗垎浜噷鐨勮鏁版嵁鍒犻櫎: {}",aBoolean);
//灏咶lowlevel 璁剧疆涓�0;
ServiceReimbursement serviceReimbursement = new ServiceReimbursement();
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
diff --git a/ruoyi-ui/src/api/monitor/logininfor.js b/ruoyi-ui/src/api/monitor/logininfor.js
index 383d61f..7ff412d 100644
--- a/ruoyi-ui/src/api/monitor/logininfor.js
+++ b/ruoyi-ui/src/api/monitor/logininfor.js
@@ -32,4 +32,4 @@
method: 'get',
params: query
})
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3