From b59efa774fbf19c39da44b6cb4f5c65f1f7e0d25 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 28 Apr 2023 16:43:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.java | 1 +
skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/engine/controller/FlowModelController.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/impl/AppManageService.java | 5 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 6 ++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.xml | 3 +++
skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/resources/application.yml | 8 ++++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/controller/AppManageController.java | 12 ++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/IAppManageService.java | 5 +++++
8 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/engine/controller/FlowModelController.java b/skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/engine/controller/FlowModelController.java
index 4d462f5..fda5cf7 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/engine/controller/FlowModelController.java
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/engine/controller/FlowModelController.java
@@ -46,7 +46,7 @@
@RestController
@RequestMapping("model")
@AllArgsConstructor
-@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
public class FlowModelController {
private final FlowEngineService flowEngineService;
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/resources/application.yml b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/resources/application.yml
index f5e2576..1bf3617 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/resources/application.yml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/resources/application.yml
@@ -7,7 +7,7 @@
enabled: true
name: minio
tenant-mode: true
- endpoint: http://127.0.0.1:9000
- access-key: D99KGE6ZTQXSATTJWU24
- secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
- bucket-name: bladex
+ endpoint: http://10.10.2.251:8082
+ access-key: minioadmin
+ secret-key: Gistack@2023_hb
+ bucket-name: test
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/controller/AppManageController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/controller/AppManageController.java
index 9275c70..e0c68d2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/controller/AppManageController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/controller/AppManageController.java
@@ -77,4 +77,16 @@
return R.data(appManageService.removeById(id));
}
+ /**
+ * 查询最新一条的数据
+ *
+ * @return
+ */
+ @ApiOperation(value = "app管理-分页列表查询", notes = "app管理-分页列表查询")
+ @GetMapping(value = "/getLastInfo")
+ public R getLastInfo() {
+ AppManage appManage = appManageService.getLastInfo();
+ return R.data(appManage);
+ }
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.java
index 5e22189..41a8508 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.java
@@ -11,4 +11,5 @@
* @Version 1.0
*/
public interface AppManageMapper extends BaseMapper<AppManage> {
+ AppManage getLastInfo();
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.xml
index b63828d..de7a4fe 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.xml
@@ -3,4 +3,7 @@
<mapper namespace="cn.gistack.sm.appmanage.mapper.AppManageMapper">
+ <select id="getLastInfo" resultType="cn.gistack.sm.appmanage.entity.AppManage">
+ SELECT * FROM SM_APP_MANAGE ORDER BY CREATE_TIME DESC LIMIT 1
+ </select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/IAppManageService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/IAppManageService.java
index ae7d663..d4bcdeb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/IAppManageService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/IAppManageService.java
@@ -11,4 +11,9 @@
* @Version 1.0
*/
public interface IAppManageService extends BaseService<AppManage> {
+ /**
+ * 获取最新的数据
+ * @return
+ */
+ AppManage getLastInfo();
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/impl/AppManageService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/impl/AppManageService.java
index cc9298c..866ed57 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/impl/AppManageService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/impl/AppManageService.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.appmanage.entity.AppManage;
import cn.gistack.sm.appmanage.mapper.AppManageMapper;
import cn.gistack.sm.appmanage.service.IAppManageService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
@@ -15,4 +16,8 @@
*/
@Service
public class AppManageService extends BaseServiceImpl<AppManageMapper, AppManage> implements IAppManageService {
+ @Override
+ public AppManage getLastInfo() {
+ return baseMapper.getLastInfo();
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
index b9bdfb0..e4c769a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -23,6 +23,12 @@
<if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
AND spt.project_id = #{patrolTask.projectId}
</if>
+ <if test="patrolTask.toUserId != null and patrolTask.toUserId !=''">
+ AND spt.to_user_id = #{patrolTask.toUserId}
+ </if>
+ <if test="patrolTask.state != null and patrolTask.state !=''">
+ AND spt.state = #{patrolTask.state}
+ </if>
</select>
<!--查询巡查人员统计数据信息-->
--
Gitblit v1.9.3