提交代码

ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -103,7 +103,7 @@ public class AuthController {
         Long userId = LoginHelper.getUserId();
         scheduledExecutorService.schedule(() -> {
             SseMessageDto dto = new SseMessageDto();
-            dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统");
+            dto.setMessage("欢迎登录国研数字化运维管理平台");
             dto.setUserIds(List.of(userId));
             SseMessageUtils.publishMessage(dto);
         }, 5, TimeUnit.SECONDS);

ruoyi-admin/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP
@@ -13,7 +13,7 @@ spring.boot.admin.client:
 
 --- # snail-job 配置
 snail-job:
-  enabled: true
+  enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   group: "ruoyi_group"
   # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表
@@ -49,33 +49,38 @@ spring:
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
           url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: root
+          password: 1234
+
+
+        #          url: jdbc:mysql://10.1.21.250:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+        #          username: root
+        #          password: HXj-6nR|D8xy*h#!I&:(
         # 从库数据源
-        slave:
+      #        slave:
-          lazy: true
+      #          lazy: true
-          type: ${spring.datasource.type}
+      #          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
+      #          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-          username:
+      #          username:
-          password:
+      #          password:
-#        oracle:
+      #        oracle:
-#          type: ${spring.datasource.type}
+      #          type: ${spring.datasource.type}
-#          driverClassName: oracle.jdbc.OracleDriver
+      #          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//localhost:1521/XE
+      #          url: jdbc:oracle:thin:@//localhost:1521/XE
-#          username: ROOT
+      #          username: ROOT
-#          password: root
+      #          password: root
-#        postgres:
+      #        postgres:
-#          type: ${spring.datasource.type}
+      #          type: ${spring.datasource.type}
-#          driverClassName: org.postgresql.Driver
+      #          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+      #          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-#          username: root
+      #          username: root
-#          password: root
+      #          password: root
-#        sqlserver:
+      #        sqlserver:
-#          type: ${spring.datasource.type}
+      #          type: ${spring.datasource.type}
-#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      #          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
+      #          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
-#          username: SA
+      #          username: SA
-#          password: root
+      #          password: root
       hikari:
         # 最大连接池数量
         maxPoolSize: 20
@@ -102,7 +107,7 @@ spring.data:
     # 数据库索引
     database: 0
     # redis 密码必须配置
-    password: ruoyi123
+    #    password: ruoyi123
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

ruoyi-admin/src/main/resources/application.yml

@@ -21,8 +21,8 @@ captcha:
 
 # 开发环境配置
 server:
-  # 服务器的HTTP端口 本地默认为:8080  远程测试 dev:18080
+  # 服务器的HTTP端口 本地默认为:8080  远程测试 dev:18080  prod: 18082
-  # prod: 18082
+  # 鄞州公安默认:8080
   port: 8080
   servlet:
     # 应用的访问路径

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PointInfoController.java

@@ -107,8 +107,8 @@ public class PointInfoController extends BaseController {
 
     //@SaCheckPermission("platform:pointInfo:queryPointNames")
     @GetMapping("/queryPointNames")
-    public R<List<PointSelectVo>> queryPointNames() {
+    public R<List<PointSelectVo>> queryPointNames(PointInfoBo bo) {
-        List<PointSelectVo> rs = pointInfoService.queryPointNames();
+        List<PointSelectVo> rs = pointInfoService.queryPointNames(bo);
         return R.ok(rs);
     }
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IPointInfoService.java

@@ -72,7 +72,7 @@ public interface IPointInfoService {
      * 获取点位信息 下拉框
      * @return
      */
-    List<PointSelectVo> queryPointNames();
+    List<PointSelectVo> queryPointNames(PointInfoBo bo);
 
     void addData(List<PointInfo> list);
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/PointInfoServiceImpl.java

@@ -168,11 +168,12 @@ public class PointInfoServiceImpl implements IPointInfoService {
     }
 
     @Override
-    public List<PointSelectVo> queryPointNames() {
+    public List<PointSelectVo> queryPointNames(PointInfoBo bo) {
-        List<PointInfo> pointInfos = baseMapper.selectList();
+        LambdaQueryWrapper<PointInfo> lqw = buildQueryWrapper(bo);
+        List<PointInfoVo> pointInfos = baseMapper.selectVoList(lqw);
 
         List<PointSelectVo> pointSelectVos = new ArrayList<>();
-        for (PointInfo pointInfo : pointInfos) {
+        for (PointInfoVo pointInfo : pointInfos) {
             PointSelectVo pointSelectVo = new PointSelectVo();
             BeanUtils.copyProperties(pointInfo, pointSelectVo);
             pointSelectVos.add(pointSelectVo);

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java

@@ -79,7 +79,7 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
         Set<String> rolePermission = loginUser.getRolePermission();
         //设置权限:如果是监理和超级管理员可以访问全部的项目信息
         //其余人员只能看到自己的项目信息
-        String[] requiredRoles = {"jianli", "superadmin"};
+        String[] requiredRoles = {"jianli", "superadmin","yunwei"};
         boolean hasAnyRole = Arrays.stream(requiredRoles)
             .anyMatch(rolePermission::contains);
 

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java

@@ -113,6 +113,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
     @Override
     public WorkOrderInfoVo queryById(String id){
         WorkOrderInfoVo workOrderInfoVo = baseMapper.selectVoById(id);
+
         // 设置待处理人信息
         workOrderInfoVo.setHandler(workOrderInfoVo.getMaintenanceUnit());
         String attachment = workOrderInfoVo.getAttachment();
@@ -230,7 +231,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
         //所属机构:organization_name
         lqw.eq(StringUtils.isNotBlank(bo.getOrganizationName()), WorkOrderInfo::getOrganizationName, bo.getOrganizationName());
         //故障地点:fault_location
-        lqw.eq(StringUtils.isNotBlank(bo.getFaultLocation()), WorkOrderInfo::getFaultLocation, bo.getFaultLocation());
+        lqw.like(StringUtils.isNotBlank(bo.getFaultLocation()), WorkOrderInfo::getFaultLocation, bo.getFaultLocation());
         lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), WorkOrderInfo::getFaultDescription, bo.getFaultDescription());
         lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), WorkOrderInfo::getAttachment, bo.getAttachment());
         lqw.eq(bo.getMaintenanceRequirement() != null, WorkOrderInfo::getMaintenanceRequirement, bo.getMaintenanceRequirement());