后端修改

xinnengyuan/pom.xml

@@ -307,7 +307,6 @@
                 <artifactId>snail-job-client-job-core</artifactId>
                 <version>${snailjob.version}</version>
             </dependency>
-
             <!-- 加密包引入 -->
             <dependency>
                 <groupId>org.bouncycastle</groupId>

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

@@ -6,6 +6,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,8 @@ import org.dromara.common.social.utils.SocialUtils;
 import org.dromara.common.sse.dto.SseMessageDto;
 import org.dromara.common.sse.utils.SseMessageUtils;
 import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.core.factory.SmsFactory;
 import org.dromara.system.domain.bo.SysTenantBo;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.domain.vo.SysTenantVo;
@@ -41,16 +44,20 @@ import org.dromara.web.domain.vo.TenantListVo;
 import org.dromara.web.service.IAuthStrategy;
 import org.dromara.web.service.SysLoginService;
 import org.dromara.web.service.SysRegisterService;
+import org.dromara.websocket.domain.ChatGroup;
+import org.dromara.websocket.service.Impl.ChatGroupServiceImpl;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * 认证
@@ -72,6 +79,7 @@ public class AuthController {
     private final ISysSocialService socialUserService;
     private final ISysClientService clientService;
     private final ScheduledExecutorService scheduledExecutorService;
+    private final ChatGroupServiceImpl chatGroupService;
 
 
     /**
@@ -103,10 +111,7 @@ public class AuthController {
 
 //        Long userId = LoginHelper.getUserId();
 //        scheduledExecutorService.schedule(() -> {
-//            SseMessageDto dto = new SseMessageDto();
+//            chatGroupService.createSystem(userId,client.getClientKey());
-//            dto.setMessage("欢迎登录新能源项目管理系统");
-//            dto.setUserIds(List.of(userId));
-//            SseMessageUtils.publishMessage(dto);
 //        }, 5, TimeUnit.SECONDS);
         return R.ok(loginVo);
     }
@@ -193,6 +198,17 @@ public class AuthController {
         return R.ok();
     }
 
+    @PostMapping("/app/register")
+    public R<Void> appRegister(@Validated @RequestBody RegisterBody user) {
+        if("sms".equals(user.getGrantType())){
+            registerService.appSmsRegister(user);
+        }else {
+            registerService.appRegister(user);
+        }
+
+        return R.ok();
+    }
+
     /**
      * 登录页面租户下拉框
      *

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

@@ -57,16 +57,23 @@ public class CaptchaController {
      */
     @RateLimiter(key = "#phonenumber", time = 60, count = 1)
     @GetMapping("/resource/sms/code")
-    public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
+    public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber,String type) {
         String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
         String code = RandomUtil.randomNumbers(4);
         RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
         // 验证码模板id 自行处理 (查数据库或写死均可)
-        String templateId = "";
+
         LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
-        map.put("code", code);
+        map.put("1", code);
-        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+        map.put("2", Constants.CAPTCHA_EXPIRATION.toString());
-        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
+        String configName;
+        if("login".equals(type)){
+            configName = "config2";
+        }else{
+            configName = "config3";
+        }
+        SmsBlend smsBlend = SmsFactory.getSmsBlend(configName);
+        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, map);
         if (!smsResponse.isSuccess()) {
             log.error("验证码短信发送异常 => {}", smsResponse);
             return R.fail(smsResponse.getData().toString());

xinnengyuan/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java

@@ -55,7 +55,8 @@ public class UserActionListener implements SaTokenListener {
         String username = (String) loginModel.getExtra(LoginHelper.USER_NAME_KEY);
         String tenantId = (String) loginModel.getExtra(LoginHelper.TENANT_KEY);
         dto.setUserName(username);
-        dto.setClientKey((String) loginModel.getExtra(LoginHelper.CLIENT_KEY));
+        String clientId = (String) loginModel.getExtra(LoginHelper.CLIENT_KEY);
+        dto.setClientKey(clientId);
         dto.setDeviceType(loginModel.getDevice());
         dto.setDeptName((String) loginModel.getExtra(LoginHelper.DEPT_NAME_KEY));
         TenantHelper.dynamic(tenantId, () -> {
@@ -75,7 +76,7 @@ public class UserActionListener implements SaTokenListener {
         SpringUtils.context().publishEvent(logininforEvent);
         // 更新登录信息
         loginService.recordLoginInfo((Long) loginModel.getExtra(LoginHelper.USER_KEY), ip);
-        log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
+        log.info("user doLogin, userId:{}, token:{}, clientid{}", loginId, tokenValue, clientId);
     }
 
     /**

xinnengyuan/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java

@@ -77,6 +77,90 @@ public class SysRegisterService {
         recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
     }
 
+    /**
+     * 注册
+     */
+    public void appRegister(RegisterBody registerBody) {
+        String tenantId = registerBody.getTenantId();
+        String username = registerBody.getPhonenumber();
+        String password = registerBody.getPassword();
+        // 校验用户类型是否存在
+        String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
+        // 校验密码是否符合要求
+//        String pattern = "^(?!.*\\s)(?!^[a-zA-Z]+$)(?!^[0-9]+$)(?!^[^a-zA-Z0-9]+$)(?!^[a-zA-Z0-9]+$).{8,18}$";
+//        boolean isValid = password.matches(pattern);
+//        if (!isValid) {
+//            throw new UserException("注册失败，密码需满足8–18位，包含大小写字母、数字、特殊字符中的至少三种组合");
+//        }
+
+        SysUserBo sysUser = new SysUserBo();
+        sysUser.setUserName(username);
+        sysUser.setNickName(username);
+        sysUser.setPhonenumber(username);
+        sysUser.setPassword(BCrypt.hashpw(password));
+        sysUser.setUserType(userType);
+        sysUser.setEmail(registerBody.getEmail());
+
+        SysUser sysUserByPhonenumber = userMapper.selectDefFlagUser(username);
+        if(sysUserByPhonenumber != null){
+            sysUser.setUserId(sysUserByPhonenumber.getUserId());
+            userMapper.updateDefFlag(sysUser);
+            userMapper.updateConstructionUser(sysUserByPhonenumber.getUserId());
+        }else {
+
+            boolean exist = TenantHelper.dynamic(tenantId, () -> {
+                return userMapper.exists(new LambdaQueryWrapper<SysUser>()
+                    .eq(SysUser::getPhonenumber, sysUser.getPhonenumber()));
+            });
+            if (exist) {
+                throw new UserException("user.register.save.error", username);
+            }
+            boolean regFlag = userService.registerUser(sysUser, tenantId);
+            if (!regFlag) {
+                throw new UserException("user.register.error");
+            }
+        }
+
+        recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
+    }
+
+
+    /**
+     * 短信注册
+     */
+    public void appSmsRegister(RegisterBody registerBody) {
+        String tenantId = registerBody.getTenantId();
+        String username = registerBody.getPhonenumber();
+        String smsCode = registerBody.getSmsCode();
+
+        validateSmsCode(tenantId, username, smsCode);
+
+        // 校验用户类型是否存在
+        String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
+
+        // 验证码开关
+        SysUserBo sysUser = new SysUserBo();
+        sysUser.setUserName(username);
+        sysUser.setNickName(username);
+        sysUser.setPhonenumber(username);
+        sysUser.setUserType(userType);
+
+        boolean exist = TenantHelper.dynamic(tenantId, () -> {
+            return userMapper.exists(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getPhonenumber, sysUser.getPhonenumber()));
+        });
+        if (exist) {
+            throw new UserException("user.register.save.error", username);
+        }
+        boolean regFlag = userService.registerUser(sysUser, tenantId);
+        if (!regFlag) {
+            throw new UserException("user.register.error");
+        }
+
+        recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
+    }
+
+
     /**
      * 校验验证码
      *
@@ -98,6 +182,18 @@ public class SysRegisterService {
         }
     }
 
+    /**
+     * 校验短信验证码
+     */
+    private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phonenumber);
+        if (StringUtils.isBlank(code)) {
+            recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(smsCode);
+    }
+
     /**
      * 记录登录信息
      *

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

@@ -19,14 +19,14 @@ snail-job:
   # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
   token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   server:
-    host: 192.168.110.119
+    host: 127.0.0.1
     port: 17888
   # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段
   namespace: ${spring.profiles.active}
   # 随主应用端口漂移
   port: 2${server.port}
   # 客户端ip指定
-  host:
+  host: 127.0.0.1
   # RPC类型: netty, grpc
   rpc-type: grpc
 
@@ -52,14 +52,38 @@ spring:
           url: jdbc:mysql://192.168.110.2:13386/xinnengyuandev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
           username: xinnengyuandev
           password: StRWCZdZirysNSs2
+#          url: jdbc:mysql://192.168.110.2:13386/xinnengyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#          username: xinnengyuan
+#          password: mEZPC5Sdf3r2HENi
           # 从库数据源
+        slave:
+          lazy: true
+          type: ${spring.datasource.type}
+          driverClassName: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://192.168.110.2:13386/zmkgc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          username: zmkgc
+          password: nWKDKRNRT48tFBdh
+        slave1:
+          lazy: true
+          type: ${spring.datasource.type}
+          driverClassName: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://192.168.110.2:13386/zmkgprod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          username: zmkgprod
+          password: MaY8nehwWkJriWPm
+        slave2:
+          lazy: true
+          type: ${spring.datasource.type}
+          driverClassName: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://192.168.110.2:13386/zmkgc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          username: zmkgc
+          password: nWKDKRNRT48tFBdh
 #        slave:
 #          lazy: true
 #          type: ${spring.datasource.type}
 #          driverClassName: com.mysql.cj.jdbc.Driver
-#          url: jdbc:mysql://192.168.110.2:13386/zmkgdev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+#          url: jdbc:mysql://192.168.110.2:13386/zmkgprod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-#          username: zmkgdev
+#          username: zmkgprod
-#          password: JhYxREf25AXdy3h8
+#          password: MaY8nehwWkJriWPm
       #        oracle:
       #          type: ${spring.datasource.type}
       #          driverClassName: oracle.jdbc.OracleDriver
@@ -102,7 +126,7 @@ spring.data:
     # 端口，默认为6379
     port: 9287
     # 数据库索引
-    database: 10
+    database: 16
     # redis 密码必须配置
     password: syar23rdsaagdrsa
     # 连接超时时间
@@ -161,7 +185,7 @@ sms:
   # 配置源类型用于标定配置来源(interface,yaml)
   config-type: yaml
   # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
-  restricted: true
+  restricted: false
   # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
   minute-max: 1
   # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
@@ -180,12 +204,45 @@ sms:
       signature: 您的短信签名
       sdk-app-id: 您的sdkAppId
     config2:
-      # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      # 登录
       supplier: tencent
-      access-key-id: 您的accessKey
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
-      access-key-secret: 您的accessKeySecret
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
-      signature: 您的短信签名
+      signature: 重庆远界大数据研究院
-      sdk-app-id: 您的sdkAppId
+      sdk-app-id: 1401018866
+      template-id: 2491779
+    config3:
+      # 注册
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2491776
+    config4:
+      # 质量工单逾期
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534747
+    config5:
+      # 设计图纸
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534750
+    config6:
+      # 安全工单
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534848
 
 
 --- # 三方授权
@@ -274,7 +331,10 @@ dxf2GeoJson:
   file-name: main.exe
 ys7:
   app-key: 3acf9f1a43dc4209841e0893003db0a2
-  app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36
+  app-secret: 09e29c70ae1161fbc3ce2030fc09ba2e
+  job:
+    capture-enabled: false   # 控制是否启用萤石抓拍任务
+    device-sync-enabled: false # 控制是否同步萤石设备
 #ys7:
 #  app-key: 081b0d6d5f7f4de8bc5c7fa350fb26ec
 #  app-secret: caa37b9f60ef02deb57e563bc190e6db
@@ -287,7 +347,10 @@ sparta:
 id-card:
   encrypt-key: 7ae260d150a14027d2238a1cf80a48ef
 recognizer:
-  url: http://192.168.110.5:50070
+  url: http://192.168.110.5:50071
 
 qrCode:
   url: http://192.168.110.151:7788
+# 无人机大图
+drone:
+  url: http://192.168.110.2:9512

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

@@ -290,3 +290,6 @@ recognizer:
 
 qrCode:
   url: http://xny.yj-3d.com:7171
+# 无人机大图
+drone:
+  url: http://192.168.110.2:9512

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

@@ -16,7 +16,7 @@ spring.boot.admin.client:
 
 --- # snail-job 配置
 snail-job:
-  enabled: false
+  enabled: true
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   group: "ruoyi_group"
   # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表
@@ -29,7 +29,7 @@ snail-job:
   # 随主应用端口漂移
   port: 2${server.port}
   # 客户端ip指定
-  host:
+  host: 127.0.0.1
   # RPC类型: netty, grpc
   rpc-type: grpc
 
@@ -60,6 +60,21 @@ spring:
       #          lazy: true
       #          type: ${spring.datasource.type}
       #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://192.168.110.2:13386/zmkgc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username: zmkgc
+      #          password: nWKDKRNRT48tFBdh
+      #        slave1:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://192.168.110.2:13386/zmkgprod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username: zmkgprod
+      #          password: MaY8nehwWkJriWPm
+      #        # 从库数据源
+      #        slave:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          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
       #          username:
       #          password:
@@ -164,7 +179,7 @@ sms:
   # 配置源类型用于标定配置来源(interface,yaml)
   config-type: yaml
   # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
-  restricted: true
+  restricted: false
   # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
   minute-max: 1
   # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
@@ -183,12 +198,45 @@ sms:
       signature: 您的短信签名
       sdk-app-id: 您的sdkAppId
     config2:
-      # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      # 登录
       supplier: tencent
-      access-key-id: 您的accessKey
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
-      access-key-secret: 您的accessKeySecret
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
-      signature: 您的短信签名
+      signature: 重庆远界大数据研究院
-      sdk-app-id: 您的sdkAppId
+      sdk-app-id: 1401018866
+      template-id: 2491779
+    config3:
+      # 注册
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2491776
+    config4:
+      # 质量工单逾期
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534747
+    config5:
+      # 设计图纸
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534750
+    config6:
+      # 安全工单
+      supplier: tencent
+      access-key-id: AKIDb3JK5dx4wa0DCxWqvxlKejvysZ3ITVJv
+      access-key-secret: c5LPFsJI8k7GDxTkoeFj4A1ukQr66rPi
+      signature: 重庆远界大数据研究院
+      sdk-app-id: 1401018866
+      template-id: 2534848
 
 --- # 三方授权
 justauth:
@@ -276,7 +324,10 @@ dxf2GeoJson:
   file-name: main
 ys7:
   app-key: 3acf9f1a43dc4209841e0893003db0a2
-  app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36
+  app-secret: 09e29c70ae1161fbc3ce2030fc09ba2e
+  job:
+    capture-enabled: false   # 控制是否启用萤石抓拍任务
+    device-sync-enabled: true # 控制是否同步萤石设备
 # 斯巴达算法
 sparta:
   url: http://119.3.204.120:8040
@@ -286,7 +337,10 @@ sparta:
 id-card:
   encrypt-key: 7ae260d150a14027d2238a1cf80a48ef
 recognizer:
-  url: http://192.168.110.5:50070
+  url: http://192.168.110.5:50071
 
 qrCode:
   url: http://xny.yj-3d.com:7788
+# 无人机大图
+drone:
+  url: http://192.168.110.2:9512

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

@@ -122,10 +122,14 @@ security:
     - /warm-flow-ui/**
     - /warm-flow/**
     - /other/ys7Device/webhook
+    - /**/changxie/callback/**
+    - /progress/progressPlanDetail/insert/numberAI
+    - /project/project/list/sub/matrix/**
+    - /gps/equipment/dataAcceptance
+    - /resource/oss/upload
     # todo 仅测试
     - /facility/matrix/**
-    - /**/changxie/callback/**
+    - /hat/device/data
-    - /gps/equipment/dataAcceptance
 
 # 多租户配置
 tenant:
@@ -249,8 +253,8 @@ springdoc:
       packages-to-scan: org.dromara.design
     - group: 13.工作流模块
       packages-to-scan: org.dromara.workflow
-    - group: 14.罗成模块
+    - group: 14.合同模块
-      packages-to-scan: org.dromara.cory
+      packages-to-scan: org.dromara.ctr
     - group: 15.无人机模块
       packages-to-scan: org.dromara.drone
     - group: 20.代码生成模块
@@ -263,8 +267,6 @@ springdoc:
       packages-to-scan: org.dromara.out
     - group: 19.消息模块
       packages-to-scan: org.dromara.message
-#    - group: 20.手续模块
-#      packages-to-scan: org.dromara.formalities
     - group: 21.分标策划模块
       packages-to-scan: org.dromara.tender
     - group: 22.大屏模块
@@ -273,13 +275,16 @@ springdoc:
       packages-to-scan: org.dromara.bidding
     - group: 23.GPS定位模块
       packages-to-scan: org.dromara.gps
-
+    - group: 24.招标模块
-#    - group: 20.合同模块
+      packages-to-scan: org.dromara.tender
-#      packages-to-scan: org.dromara.ctr
+#    - group: 25.app版本模块
-#    - group: 21.招标模块
+#      packages-to-scan: org.dromara.app
-#      packages-to-scan: org.dromara.tender
+    - group: 25.数据迁移模块
-
+      packages-to-scan: org.dromara.transferData
-
+    - group: 26.netty消息模块
+      packages-to-scan: org.dromara.websocket
+    - group: 27.新中大模块
+      packages-to-scan: org.dromara.xzd
 # knife4j的增强配置，不需要增强可以不配
 knife4j:
   enable: true
@@ -294,6 +299,7 @@ xss:
   excludeUrls:
     - /system/notice
     - /warm-flow/save-xml
+    - /project/project
 
 # 全局线程池相关配置
 # 如使用JDK21请直接使用虚拟线程 不要开启此配置
@@ -332,12 +338,13 @@ sse:
   copy: /task/taskCopyList
   project: /personnel-management/project
   violationRecord: /safety-management/ai/violationRecord
+  drawing: /design-management/volumeCatalog
 
 
 --- # websocket
 websocket:
   # 如果关闭 需要和前端开关一起关闭
-  enabled: false
+  enabled: true
   # 路径
   path: /resource/websocket
   # 设置访问源地址

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java

@@ -1,21 +1,61 @@
 package org.dromara.test;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.IdcardUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.HttpStatus;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.utils.IdCardEncryptorUtil;
+import org.dromara.contractor.domain.SubConstructionUser;
+import org.dromara.contractor.service.ISubConstructionUserService;
+import org.dromara.contractor.service.ISubUserSalaryDetailService;
 import org.dromara.design.service.IDesTechnicalStandardService;
 import org.dromara.facility.domain.FacMatrix;
 import org.dromara.facility.service.IFacMatrixService;
 import org.dromara.facility.service.IFacPhotovoltaicPanelPartsService;
+import org.dromara.facility.service.IFacPhotovoltaicPanelService;
+import org.dromara.manager.recognizermanager.vo.RecognizeConvertCoordinateResult;
+import org.dromara.manager.ys7manager.Ys7Constant;
+import org.dromara.manager.ys7manager.Ys7Manager;
+import org.dromara.manager.ys7manager.vo.Ys7ResponseVo;
+import org.dromara.other.domain.OthYs7Device;
+import org.dromara.other.service.IOthYs7DeviceService;
+import org.dromara.out.domain.OutConstructionValue;
+import org.dromara.out.domain.OutConstructionValueRange;
+import org.dromara.out.service.IOutConstructionValueRangeService;
+import org.dromara.out.service.IOutConstructionValueService;
+import org.dromara.progress.domain.PgsProgressCategory;
+import org.dromara.progress.domain.PgsProgressPlanDetail;
+import org.dromara.progress.domain.dto.progresscategory.PgsProgressCategoryCreateReq;
 import org.dromara.progress.service.IPgsProgressCategoryService;
 import org.dromara.progress.service.IPgsProgressCategoryTemplateService;
+import org.dromara.progress.service.IPgsProgressPlanDetailService;
+import org.dromara.project.domain.BusProject;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.system.service.ISysDeptService;
+import org.dromara.tender.service.impl.TenderSupplierInputServiceImpl;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.util.Date;
+import java.math.BigDecimal;
-import java.util.List;
+import java.math.RoundingMode;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @author lilemy
@@ -34,6 +74,9 @@ public class DemoTest {
     @Resource
     private IPgsProgressCategoryTemplateService progressCategoryTemplateService;
 
+    @Resource
+    private IPgsProgressPlanDetailService progressPlanDetailService;
+
     @Resource
     private IFacMatrixService matrixService;
 
@@ -45,6 +88,227 @@ public class DemoTest {
 
     @Resource
     private ISysDeptService deptService;
+    @Autowired
+    private TenderSupplierInputServiceImpl tenderSupplierInputService;
+
+    @Resource
+    private ISubConstructionUserService constructionUserService;
+
+    @Resource
+    private ISubUserSalaryDetailService userSalaryDetailService;
+
+    @Resource
+    private IdCardEncryptorUtil idCardEncryptorUtil;
+
+    @Resource
+    private IFacPhotovoltaicPanelService photovoltaicPanelService;
+
+    @Resource
+    private IOutConstructionValueRangeService constructionValueRangeService;
+
+    @Resource
+    private IOutConstructionValueService constructionValueService;
+
+    @Resource
+    private IOthYs7DeviceService ys7DeviceService;
+
+    @Resource
+    private Ys7Manager ys7Manager;
+
+
+    @Test
+    void testConstructionValue() {
+/*        LocalDate today = LocalDate.now();
+        // 找到本周一
+        LocalDate thisMonday = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+        // 上周一 = 本周一 - 1 周
+        LocalDate lastMonday = thisMonday.minusWeeks(1);
+        // 上周日 = 上周一 + 6 天
+        LocalDate lastSunday = lastMonday.plusDays(6);
+        log.info("执行定时任务：同步 {}至{} 计划详情到施工产值", lastMonday, lastSunday);
+        Boolean synced = progressPlanDetailService.syncPlanDetail2ConstructionValue(lastMonday, lastSunday, null);*/
+        LocalDate start = LocalDate.of(2024, 1, 1); // 起始时间（2024-01-01）
+        LocalDate end = LocalDate.of(2025, 10, 20); // 截止时间（2025-09-15）
+
+        // 如果起始不是周一，调整到当周的周一
+        if (start.getDayOfWeek() != DayOfWeek.MONDAY) {
+            start = start.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+        }
+
+        while (!start.isAfter(end)) {
+            LocalDate monday = start;
+            LocalDate sunday = start.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
+
+            // 输出本周的周一和周日
+            System.out.println(monday + " ~ " + sunday);
+            log.info("执行定时任务：同步 {}至{} 计划详情到施工产值", monday, sunday);
+//        Boolean synced = progressPlanDetailService.syncPlanDetail2ConstructionValue(start, now, null);
+            // 获取范围时间内的计划详情
+            List<PgsProgressPlanDetail> planDetailList = progressPlanDetailService.lambdaQuery()
+                .ge(PgsProgressPlanDetail::getDate, monday)
+                .le(PgsProgressPlanDetail::getDate, sunday)
+                .ne(PgsProgressPlanDetail::getFinishedNumber, BigDecimal.ZERO)
+//                .eq(PgsProgressPlanDetail::getStatus, "1")
+                .list();
+            if (CollUtil.isEmpty(planDetailList)) {
+                // 下一周
+                start = start.plusWeeks(1);
+                continue;
+            }
+            // 获取进度类别
+            List<Long> categoryIds = planDetailList.stream()
+                .map(PgsProgressPlanDetail::getProgressCategoryId)
+                .distinct()
+                .toList();
+            List<PgsProgressCategory> categoryList = progressCategoryService.lambdaQuery()
+                .in(CollUtil.isNotEmpty(categoryIds), PgsProgressCategory::getId, categoryIds)
+                .list();
+            Map<Long, PgsProgressCategory> categoryMap = categoryList.stream()
+                .collect(
+                    Collectors.toMap(PgsProgressCategory::getId,
+                        Function.identity(),
+                        (v1, v2) -> v1)
+                );
+            // 为每一个项目创建一个施工产值范围
+            Set<Long> projectIds = planDetailList.stream()
+                .map(PgsProgressPlanDetail::getProjectId).collect(Collectors.toSet());
+            // 获取所有父级项目
+            List<BusProject> projectList = projectService.listByIds(projectIds);
+            List<Long> allProjectIds = projectList
+                .stream().map(project -> {
+                    if (project.getPId() != 0L) {
+                        return project.getPId();
+                    } else {
+                        return project.getId();
+                    }
+                }).distinct().toList();
+            // 根据项目区分
+            Map<Long, List<PgsProgressPlanDetail>> detailMap = planDetailList.stream()
+                .collect(Collectors.groupingBy(PgsProgressPlanDetail::getProjectId));
+            List<OutConstructionValue> saveList = new ArrayList<>();
+            List<PgsProgressPlanDetail> allUpdateList = new ArrayList<>();
+            List<OutConstructionValueRange> ranges = allProjectIds.stream().map(id -> {
+                OutConstructionValueRange range = new OutConstructionValueRange();
+                long rangeId = IdWorker.getId(range);
+                range.setId(rangeId);
+                range.setProjectId(id);
+                range.setStartDate(monday);
+                range.setEndDate(sunday);
+                // 获取所有子项目
+                List<Long> subProject = new ArrayList<>(projectList.stream()
+                    .filter(project -> Objects.equals(project.getPId(), id))
+                    .map(BusProject::getId)
+                    .distinct()
+                    .toList());
+                subProject.add(id);
+                List<PgsProgressPlanDetail> detailList = new ArrayList<>();
+                for (Long p : subProject) {
+                    List<PgsProgressPlanDetail> details = detailMap.getOrDefault(p, List.of());
+                    detailList.addAll(details);
+                }
+                if (CollUtil.isEmpty(detailList)) {
+                    return null;
+                }
+                BigDecimal allConstructionValue = BigDecimal.ZERO;
+                BigDecimal allOwnerValue = BigDecimal.ZERO;
+                List<PgsProgressPlanDetail> updateList = new ArrayList<>();
+                for (PgsProgressPlanDetail planDetail : detailList) {
+                    OutConstructionValue value = new OutConstructionValue();
+                    Long progressCategoryId = planDetail.getProgressCategoryId();
+                    PgsProgressCategory category = categoryMap.get(progressCategoryId);
+                    if (category == null) {
+                        continue;
+                    }
+                    value.setProjectId(id);
+                    value.setRangeId(rangeId);
+                    value.setMatrixId(category.getMatrixId());
+                    value.setProgressCategoryId(progressCategoryId);
+                    value.setDetailId(planDetail.getId());
+                    BigDecimal finishedNumber = planDetail.getFinishedNumber();
+                    BigDecimal aiFill = planDetail.getAiFill();
+                    // 如果完成数量为0, 则不保存
+                    if (finishedNumber.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
+                    value.setArtificialNum(finishedNumber.subtract(aiFill).intValue());
+                    value.setUavNum(aiFill.intValue());
+                    value.setPlanNum(planDetail.getPlanNumber().intValue());
+                    value.setReportDate(planDetail.getDate());
+                    value.setPlanDate(planDetail.getDate());
+                    // 计算产值
+                    BigDecimal constructionPrice = category.getConstructionPrice();
+                    BigDecimal ownerPrice = category.getOwnerPrice();
+                    BigDecimal constructionValue = constructionPrice.multiply(finishedNumber).setScale(4, RoundingMode.HALF_UP);
+                    BigDecimal ownerValue = ownerPrice.multiply(finishedNumber).setScale(4, RoundingMode.HALF_UP);
+                    value.setOutValue(constructionValue);
+                    value.setOwnerValue(ownerValue);
+                    // 统计总产值
+                    allConstructionValue = allConstructionValue.add(constructionValue);
+                    allOwnerValue = allOwnerValue.add(ownerValue);
+                    // 添加需要修改状态的计划详情
+                    PgsProgressPlanDetail update = new PgsProgressPlanDetail();
+                    update.setId(planDetail.getId());
+                    update.setStatus("2");
+                    updateList.add(update);
+                    saveList.add(value);
+                }
+                range.setOutValue(allConstructionValue.setScale(4, RoundingMode.HALF_UP));
+                range.setOwnerValue(allOwnerValue.setScale(4, RoundingMode.HALF_UP));
+                // 如果产值都为0，则不保存
+                if (allConstructionValue.compareTo(BigDecimal.ZERO) == 0 && allOwnerValue.compareTo(BigDecimal.ZERO) == 0) {
+                    return null;
+                }
+                allUpdateList.addAll(updateList);
+                return range;
+            }).filter(Objects::nonNull).toList();
+            // 保存数据
+            if (CollUtil.isNotEmpty(ranges)) {
+                boolean saveBatch = constructionValueRangeService.saveBatch(ranges);
+                if (!saveBatch) {
+                    throw new ServiceException("同步计划详情到施工产值失败，数据库异常", HttpStatus.ERROR);
+                }
+            }
+            if (CollUtil.isNotEmpty(saveList)) {
+                boolean saved = constructionValueService.saveBatch(saveList);
+                if (!saved) {
+                    throw new ServiceException("同步计划详情到施工产值失败，数据库异常", HttpStatus.ERROR);
+                }
+            }
+            if (CollUtil.isNotEmpty(allUpdateList)) {
+                boolean updateBatch = progressPlanDetailService.updateBatchById(allUpdateList);
+                if (!updateBatch) {
+                    throw new ServiceException("同步计划详情到施工产值失败，数据库异常", HttpStatus.ERROR);
+                }
+
+            }
+            // 下一周
+            start = start.plusWeeks(1);
+        }
+/*        LocalDate today = LocalDate.of(2025, 9, 16);
+        LocalDate localDate = today.minusDays(1);*/
+/*        // 找到本周一
+        LocalDate thisMonday = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+        // 上周一 = 本周一 - 1 周
+        LocalDate lastMonday = thisMonday.minusWeeks(1);
+        // 上周日 = 上周一 + 6 天
+        LocalDate lastSunday = lastMonday.plusDays(6);*/
+
+    }
+
+    @Test
+    void setIdCardEncryptorUtil() {
+        List<SubConstructionUser> list = constructionUserService.list();
+        List<SubConstructionUser> update = list.stream().filter(user -> StringUtils.isNotBlank(user.getSfzNumber()))
+            .filter(user -> IdcardUtil.isValidCard18(user.getSfzNumber()))
+            .toList().stream()
+            .map(user -> {
+                SubConstructionUser updateUser = new SubConstructionUser();
+                updateUser.setId(user.getId());
+                updateUser.setSfzNumber(idCardEncryptorUtil.encrypt(user.getSfzNumber()));
+                return updateUser;
+            }).toList();
+        constructionUserService.updateBatchById(update);
+    }
 
     @Test
     void test() {
@@ -99,4 +363,188 @@ public class DemoTest {
         deptService.selectProjectIdById(100L);
         deptService.selectProjectIdById(1937478258803171329L);
     }*/
+
+    @Test
+    void tenderExport() {
+        // 同步修改用户表的team_id字段并添加入场时间
+        LambdaUpdateWrapper<SubConstructionUser> constructionUserLuw = Wrappers.lambdaUpdate(SubConstructionUser.class)
+            .in(SubConstructionUser::getId, 1961446214960435201L, 1963077776210710529L, 1963080543771832321L, 1963151975159324673L)
+            .set(SubConstructionUser::getEntryDate, new Date());
+        constructionUserService.update(constructionUserLuw);
+    }
+
+    @Test
+    void testSalary() {
+        List<SubConstructionUser> list = constructionUserService.lambdaQuery()
+            .eq(SubConstructionUser::getProjectId, 1897160897167638529L)
+            .list();
+        if (CollUtil.isNotEmpty(list)) {
+            for (SubConstructionUser user : list) {
+                for (int i = 1; i < 7; i++) {
+                    userSalaryDetailService.insertByAttendance(user.getSysUserId(), LocalDate.now().minusDays(i));
+                }
+            }
+        }
+    }
+
+    @Test
+    void testImport() {
+        photovoltaicPanelService.updateFinishNumberByCoordinate(List.of(1968510961294921730L),
+            List.of(new RecognizeConvertCoordinateResult("107.124334530", "23.830557974")));
+    }
+
+    @Test
+    void testRemove() {
+        List<Long> projectIds = List.of(
+            1968510961294921730L,
+            1968511074637598722L,
+            1968511192354934785L,
+            1968514103508094977L,
+            1968514270462365697L,
+            1968515178185248770L,
+            1968515232044306434L,
+            1968515275153362945L,
+            1968515323392053250L,
+            1968515384058466306L,
+            1968515428077686785L,
+            1968515467575447554L,
+            1968515518674653186L
+        );
+        for (Long projectId : projectIds) {
+            PgsProgressCategory p = progressCategoryService.lambdaQuery()
+                .eq(PgsProgressCategory::getProjectId, projectId)
+                .eq(PgsProgressCategory::getMatrixId, "0")
+                .eq(PgsProgressCategory::getName, "地埋电缆")
+                .one();
+            progressCategoryService.remove(new LambdaQueryWrapper<>(PgsProgressCategory.class)
+                .eq(PgsProgressCategory::getParentId, p.getId()));
+            progressCategoryService.removeById(p);
+        }
+    }
+
+    @Test
+    void testProject1() {
+        List<BusProject> projects = projectService.lambdaQuery()
+            .eq(BusProject::getPId, 1897160897167638529L)
+            .list();
+        List<Long> projectIds = projects.stream().map(BusProject::getId).toList();
+        List<PgsProgressCategory> t10101 = progressCategoryService.lambdaQuery()
+            .in(PgsProgressCategory::getProjectId, projectIds)
+            .ne(PgsProgressCategory::getMatrixId, "0")
+            .eq(PgsProgressCategory::getMatrixName, "T10101")
+            .list();
+        log.info("t10101: {}", t10101);
+        Map<String, PgsProgressCategory> name = t10101.stream()
+            .collect(Collectors.toMap(PgsProgressCategory::getName, Function.identity()));
+        List<PgsProgressCategory> other = progressCategoryService.lambdaQuery()
+            .in(PgsProgressCategory::getProjectId, projectIds)
+            .ne(PgsProgressCategory::getMatrixId, "0")
+            .ne(PgsProgressCategory::getMatrixName, "T10101")
+            .ne(PgsProgressCategory::getParentId, 0)
+            .list();
+        log.info("other: {}", other);
+        other.forEach(o -> {
+            o.setId(o.getId());
+            PgsProgressCategory category = name.get(o.getName());
+            if (StringUtils.isBlank(o.getWorkType())) {
+                o.setTotal(category.getTotal());
+            }
+            o.setUnit(category.getUnit());
+            o.setUnitType(category.getUnitType());
+            BigDecimal ownerPrice = category.getOwnerPrice();
+            o.setOwnerPrice(ownerPrice);
+            BigDecimal constructionPrice = category.getConstructionPrice();
+            o.setConstructionPrice(constructionPrice);
+            // 计算产值
+            try {
+                BigDecimal multiply = o.getOwnerPrice().multiply(o.getTotal());
+                o.setOwnerOutputValue(multiply.setScale(4, RoundingMode.HALF_UP));
+                BigDecimal multiply1 = o.getConstructionPrice().multiply(o.getTotal());
+                o.setConstructionOutputValue(multiply1.setScale(4, RoundingMode.HALF_UP));
+            } catch (Exception e) {
+            }
+        });
+        progressCategoryService.updateBatchById(other);
+    }
+
+    @Test
+    void testProject2() {
+        PgsProgressCategory p1 = progressCategoryService.lambdaQuery()
+            .eq(PgsProgressCategory::getProjectId, 1968510858786131970L)
+            .eq(PgsProgressCategory::getMatrixId, "0")
+            .eq(PgsProgressCategory::getName, "其他工程")
+            .one();
+        List<PgsProgressCategory> progressCategoryList = progressCategoryService.lambdaQuery()
+            .eq(PgsProgressCategory::getProjectId, 1968510858786131970L)
+            .eq(PgsProgressCategory::getMatrixId, "0")
+            .eq(PgsProgressCategory::getParentId, p1.getId())
+            .list();
+        List<Long> projectIds = List.of(
+            1968510961294921730L,
+            1968511074637598722L,
+            1968511192354934785L,
+            1968514103508094977L,
+            1968514270462365697L,
+            1968515178185248770L,
+            1968515232044306434L,
+            1968515275153362945L,
+            1968515323392053250L,
+            1968515384058466306L,
+            1968515428077686785L,
+            1968515467575447554L,
+            1968515518674653186L
+        );
+        for (Long projectId : projectIds) {
+            PgsProgressCategory p = progressCategoryService.lambdaQuery()
+                .eq(PgsProgressCategory::getProjectId, projectId)
+                .eq(PgsProgressCategory::getMatrixId, "0")
+                .eq(PgsProgressCategory::getName, "其他工程")
+                .one();
+            progressCategoryService.remove(new LambdaQueryWrapper<>(PgsProgressCategory.class)
+                .eq(PgsProgressCategory::getParentId, p.getId()));
+            for (PgsProgressCategory category : progressCategoryList) {
+                PgsProgressCategoryCreateReq req = new PgsProgressCategoryCreateReq();
+                req.setParentId(p.getId());
+                req.setProjectId(p.getProjectId());
+                req.setMatrixId(p.getMatrixId());
+                req.setName(category.getName());
+                req.setUnitType(category.getUnitType());
+                req.setUnit(category.getUnit());
+                req.setOwnerPrice(category.getOwnerPrice());
+                req.setConstructionPrice(category.getConstructionPrice());
+                req.setTotal(category.getTotal());
+
+                progressCategoryService.insertByReq(req);
+            }
+        }
+    }
+
+    @Test
+    void openSxtLx() {
+        String token = ys7Manager.getToken();
+        List<OthYs7Device> list = ys7DeviceService.list();
+        for (OthYs7Device othYs7Device : list) {
+            HashMap<String, Object> paramMap = new HashMap<>();
+            paramMap.put("accessToken", token);
+            paramMap.put("deviceSerial", othYs7Device.getDeviceSerial());
+            paramMap.put("enable", 1);
+            String errorMsg = "Ys7 Token 请求失败";
+            try (HttpResponse response = HttpRequest.post(Ys7Constant.setDeviceVideoUrlByPost)
+                .form(paramMap)
+                .execute()) {
+                if (!response.isOk()) {
+                    log.error("{}：{}", errorMsg, response.getStatus());
+//                    throw new ServiceException(errorMsg + response.getStatus());
+                }
+                String body = response.body();
+                Ys7ResponseVo responseVo = JSONUtil.toBean(body, Ys7ResponseVo.class);
+                if (!responseVo.getCode().equals("200")) {
+                    log.error("{}，状态码：{}，{}", errorMsg, responseVo.getCode(), responseVo.getMsg());
+//                    throw new ServiceException(errorMsg + responseVo.getMsg());
+                }
+                log.info("Ys7 Token 请求成功：{}", body);
+            }
+        }
+    }
+
 }

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/RecognizerTest.java

@@ -23,7 +23,7 @@ public class RecognizerTest {
 
     @Test
     void test() {
-        RecognizeVo recognize = recognizerManager.recognize("http://xny.yj-3d.com:7363/file/tif/20250625160218orthophoto.png", List.of(RecognizerTypeEnum.PHO));
+        RecognizeVo recognize = recognizerManager.recognize("http://xny.yj-3d.com:7363/file/tif/20250625160218orthophoto.png", List.of(RecognizerTypeEnum.SOLAR));
         log.info("recognize: {}", recognize);
     }
 }

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java

@@ -80,4 +80,9 @@ public interface CacheNames {
      */
     String ONLINE_TOKEN = "online_tokens";
 
+    /**
+     * 项目名称
+     */
+    String PROJECT_NAME = "project_name#30d";
+
 }

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java

@@ -65,7 +65,7 @@ public interface Constants {
     /**
      * 验证码有效期（分钟）
      */
-    Integer CAPTCHA_EXPIRATION = 2;
+    Integer CAPTCHA_EXPIRATION = 5;
 
     /**
      * 顶级父级id

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java

@@ -70,4 +70,9 @@ public class UserDTO implements Serializable {
      */
     private Date createTime;
 
+    /**
+     * 头像
+     */
+    private String avatarUrl;
+
 }

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java

@@ -30,4 +30,13 @@ public class RegisterBody extends LoginBody {
 
     private String userType;
 
+    private Long projectId;
+
+    private String email;
+
+    private String phonenumber;
+
+    private Long  deptId;
+
+    private String smsCode;
 }

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ProjectService.java

@@ -0,0 +1,17 @@
+package org.dromara.common.core.service;
+
+/**
+ * @author lilemy
+ * @date 2025-09-10 16:15
+ */
+public interface ProjectService {
+
+    /**
+     * 通过项目ID查询项目名称
+     *
+     * @param projectId 项目ID
+     * @return 项目名称
+     */
+    String selectProjectNameById(Long projectId);
+
+}

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java

@@ -124,4 +124,20 @@ public interface UserService {
      */
     Map<Long, String> selectPostNamesByIds(List<Long> postIds);
 
+
+    /**
+     * 通过用户id查询头像
+     */
+    String selectAvatarById(Long userId);
+
+    /**
+     * 通过用户id查询用户信息
+     */
+    UserDTO selectUser(Long userId);
+
+    /**
+     * 查询对应专业的用户Id
+     */
+    List<String> selectUserByProfession(String code,String businessId,String type,Long projectId);
+
 }

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java

@@ -376,4 +376,19 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         }
     }
 
+    /**
+     * 校验日期范围
+     *
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return true 表示日期范围有效，false 表示日期范围无效
+     */
+    public static boolean isValidDateRange(LocalDate startDate, LocalDate endDate) {
+        try {
+            return !startDate.isAfter(endDate); // start <= end
+        } catch (DateTimeParseException e) {
+            return false; // 格式非法
+        }
+    }
+
 }

xinnengyuan/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/coryUtils/ExcelReader.java

@@ -1,10 +1,7 @@
 package org.dromara.common.excel.coryUtils;
 
-import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -84,7 +81,7 @@ public class ExcelReader {
                 SheetData sheetData = new SheetData();
                 sheetData.setSheetName(sheet.getSheetName());
 
-                processSheetData(sheet, sheetData);
+                processSheetData(workbook,sheet, sheetData);
                 sheetDataList.add(sheetData);
             }
         }
@@ -114,7 +111,7 @@ public class ExcelReader {
                 sheetData.setSheetName(sheet.getSheetName());
 
                 // 处理单个sheet的数据
-                processSheetData(sheet, sheetData);
+                processSheetData(workbook, sheet, sheetData);
 
                 sheetDataList.add(sheetData);
             }
@@ -129,7 +126,7 @@ public class ExcelReader {
     /**
      * 处理单个工作表的数据
      */
-    private static void processSheetData(org.apache.poi.ss.usermodel.Sheet sheet, SheetData sheetData) {
+    private static void processSheetData(Workbook workbook, Sheet sheet, SheetData sheetData) {
         boolean foundChineseStart = false;
         List<List<String>> data = new ArrayList<>();
         boolean isFirstRow = true;
@@ -140,12 +137,12 @@ public class ExcelReader {
                 isFirstRow = false;
                 continue;
             }
-
+            if(hasValidData(workbook,row)){
                 List<String> rowData = new ArrayList<>();
                 // 读取A到E列（索引0到4）
                 for (int cellIndex = 0; cellIndex < 6; cellIndex++) {
                     Cell cell = row.getCell(cellIndex, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-                rowData.add(getCellValue(cell));
+                    rowData.add(getCellValue(workbook,cell));
                 }
 
                 // 检查是否找到中文数字开头的行
@@ -160,9 +157,24 @@ public class ExcelReader {
                 }
             }
 
+        }
+
         sheetData.setData(data);
     }
 
+    private static boolean hasValidData(Workbook workbook,Row row) {
+        // 遍历行中的所有单元格
+        for (int cellIndex = 0; cellIndex < row.getLastCellNum(); cellIndex++) {
+            Cell cell = row.getCell(cellIndex, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+            String cellValue = getCellValue(workbook, cell).trim();
+
+            // 只要有一个单元格有非空值，就认为是有效行
+            if (!cellValue.isEmpty()) {
+                return true;
+            }
+        }
+        return false;
+    }
     /**
      * 根据数据构建树形结构
      */
@@ -263,7 +275,7 @@ public class ExcelReader {
     /**
      * 获取单元格的值，处理不同数据类型
      */
-    private static String getCellValue(Cell cell) {
+    private static String getCellValue(Workbook workbook, Cell cell) {
         if (cell == null) {
             return "";
         }
@@ -278,6 +290,21 @@ public class ExcelReader {
                     return numericValue.substring(0, numericValue.length() - 2);
                 }
                 return numericValue;
+            case FORMULA:
+                //这样对于字符串cell.getStringCellValue()方法即可取得其值，如果公式生成的是数值，使用cell.getStringCellValue()方法会抛出IllegalStateException异常，在异常处理中使用cell.getNumericCellValue();
+                // 1. 获取公式文本（如 "A1+B1"）
+                String formula = cell.getCellFormula();
+                System.out.println("公式文本：" + formula);
+
+                // 2. 创建公式计算器（关键步骤：用于计算公式结果）
+                FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
+
+                // 3. 计算公式，返回包含结果类型和值的CellValue对象
+                CellValue cellValue = evaluator.evaluate(cell);
+
+                // 4. 根据结果类型提取值
+                return getValue( cellValue.getCellType(), cellValue);
+
             case BOOLEAN:
                 return String.valueOf(cell.getBooleanCellValue());
             default:
@@ -285,6 +312,19 @@ public class ExcelReader {
         }
     }
 
+    private static String getValue( CellType resultType, CellValue cellValue) {
+        return switch (resultType) {
+            case NUMERIC -> String.valueOf(cellValue.getNumberValue());
+            case STRING -> String.valueOf(cellValue.getStringValue());
+            case BOOLEAN -> String.valueOf(cellValue.getBooleanValue());
+            case ERROR -> String.valueOf(cellValue.getErrorValue());
+            case BLANK -> String.valueOf(CellType.BLANK);
+            default ->
+                // 保留原公式（不处理的类型）
+                cellValue.getStringValue();
+        };
+    }
+
     /**
      * 根据A列的值确定父节点的键
      */

xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java

@@ -71,7 +71,7 @@ public class MybatisPlusConfig {
     public PaginationInnerInterceptor paginationInnerInterceptor() {
         PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
         // 分页合理化
-        paginationInnerInterceptor.setOverflow(true);
+        paginationInnerInterceptor.setOverflow(false);
         return paginationInnerInterceptor;
     }
 

xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java

@@ -8,6 +8,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;

xinnengyuan/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java

@@ -183,7 +183,7 @@ public class OssClient {
             // 创建异步请求体（length如果为空会报错）
             BlockingInputStreamAsyncRequestBody body = BlockingInputStreamAsyncRequestBody.builder()
                 .contentLength(length)
-                .subscribeTimeout(Duration.ofSeconds(30))
+                .subscribeTimeout(Duration.ofSeconds(120)) // 增加超时时间到120秒
                 .build();
 
             // 使用 transferManager 进行上传

xinnengyuan/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java

@@ -77,7 +77,7 @@ public class RedisUtils {
     public static <T> void publish(String channelKey, T msg, Consumer<T> consumer) {
         RTopic topic = CLIENT.getTopic(channelKey);
         topic.publish(msg);
-        System.out.println("发布通道消息---------"+msg.toString());
+//        System.out.println("发布通道消息---------"+msg.toString());
         consumer.accept(msg);
     }
 

xinnengyuan/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java

@@ -28,7 +28,7 @@ public class SaPermissionImpl implements StpInterface {
     public List<String> getPermissionList(Object loginId, String loginType) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         UserType userType = UserType.getUserType(loginUser.getUserType());
-        if (userType == UserType.SYS_USER) {
+        if (userType == UserType.SYS_USER || userType == UserType.APP_USER) {
             Long projectId = loginUser.getProjectId();
             List<SysProjectRoleMenuVo> menuPermission = loginUser.getMenuPermission();
             if (CollUtil.isNotEmpty(menuPermission)) {
@@ -51,9 +51,10 @@ public class SaPermissionImpl implements StpInterface {
                 return new ArrayList<>();
             }
 
-        } else if (userType == UserType.APP_USER) {
-            // 其他端 自行根据业务编写
         }
+/*        else if (userType == UserType.APP_USER) {
+            // 其他端 自行根据业务编写
+        }*/
         return new ArrayList<>();
 //        return Collections.singletonList("*");
     }
@@ -65,7 +66,7 @@ public class SaPermissionImpl implements StpInterface {
     public List<String> getRoleList(Object loginId, String loginType) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         UserType userType = UserType.getUserType(loginUser.getUserType());
-        if (userType == UserType.SYS_USER) {
+        if (userType == UserType.SYS_USER || userType == UserType.APP_USER) {
             Long projectId = loginUser.getProjectId();
             List<SysProjectRolePermissionVo> rolePermission = loginUser.getRolePermission();
             if (CollUtil.isNotEmpty(rolePermission)) {
@@ -87,9 +88,10 @@ public class SaPermissionImpl implements StpInterface {
             } else {
                 return new ArrayList<>();
             }
-        } else if (userType == UserType.APP_USER) {
-            // 其他端 自行根据业务编写
         }
+/*        else if (userType == UserType.APP_USER) {
+            // 其他端 自行根据业务编写
+        }*/
         return new ArrayList<>();
     }
 }

xinnengyuan/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java

@@ -27,6 +27,8 @@ public class SseProperties {
 
     private String violationRecord;
 
+    private String drawing;
+
 
 
 }

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java

@@ -32,4 +32,9 @@ public interface TransConstant {
      */
     String OSS_ID_TO_URL = "oss_id_to_url";
 
+    /**
+     * 项目id转名称
+     */
+    String PROJECT_ID_TO_NAME = "project_id_to_name";
+
 }

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/ProjectNameTranslationImpl.java

@@ -0,0 +1,35 @@
+package org.dromara.common.translation.core.impl;
+
+import jakarta.annotation.Resource;
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.ProjectService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+/**
+ * @author lilemy
+ * @date 2025-09-10 16:13
+ */
+@AllArgsConstructor
+@TranslationType(type = TransConstant.PROJECT_ID_TO_NAME)
+public class ProjectNameTranslationImpl implements TranslationInterface<String> {
+
+    @Resource
+    private ProjectService projectService;
+
+    /**
+     * 翻译
+     *
+     * @param key   需要被翻译的键(不为空)
+     * @param other 其他参数
+     * @return 返回键对应的值
+     */
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof Long id) {
+            return projectService.selectProjectNameById(id);
+        }
+        return null;
+    }
+}

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -4,3 +4,4 @@ org.dromara.common.translation.core.impl.DictTypeTranslationImpl
 org.dromara.common.translation.core.impl.OssUrlTranslationImpl
 org.dromara.common.translation.core.impl.UserNameTranslationImpl
 org.dromara.common.translation.core.impl.NicknameTranslationImpl
+org.dromara.common.translation.core.impl.ProjectNameTranslationImpl

xinnengyuan/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java

@@ -13,6 +13,7 @@ import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
 import org.springframework.web.socket.server.HandshakeInterceptor;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 /**
  * WebSocket 配置

xinnengyuan/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java

@@ -12,6 +12,8 @@ public interface WebSocketConstants {
      */
     String LOGIN_USER_KEY = "loginUser";
 
+    String PROJECT_ID = "projectId";
+
     /**
      * 订阅的频道
      */

xinnengyuan/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java

@@ -13,6 +13,7 @@ import java.io.IOException;
 import java.util.List;
 
 import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY;
+import static org.dromara.common.websocket.constant.WebSocketConstants.PROJECT_ID;
 
 /**
  * WebSocketHandler 实现类
@@ -27,14 +28,17 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
      */
     @Override
     public void afterConnectionEstablished(WebSocketSession session) throws IOException {
-        LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
+//        LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
-        if (ObjectUtil.isNull(loginUser)) {
+        Long loginUser = (Long) session.getAttributes().get(PROJECT_ID);
+//        if (ObjectUtil.isNull(loginUser) ) {
+        if (loginUser == null ) {
             session.close(CloseStatus.BAD_DATA);
             log.info("[connect] invalid token received. sessionId: {}", session.getId());
             return;
         }
-        WebSocketSessionHolder.addSession(loginUser.getUserId(), session);
+        WebSocketSessionHolder.addSession(loginUser, session);
-        log.info("[connect] sessionId: {},userId:{},userType:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType());
+//        WebSocketSessionHolder.addSession(loginUser.getUserId(), session);
+//        log.info("[connect] sessionId: {},userId:{},userType:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType());
     }
 
     /**
@@ -47,11 +51,13 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
     @Override
     protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
         // 从WebSocket会话中获取登录用户信息
-        LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
+//        LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
+        Long loginUser = (Long) session.getAttributes().get(PROJECT_ID);
 
         // 创建WebSocket消息DTO对象
         WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto();
-        webSocketMessageDto.setSessionKeys(List.of(loginUser.getUserId()));
+//        webSocketMessageDto.setSessionKeys(List.of(loginUser.getUserId()));
+        webSocketMessageDto.setSessionKeys(List.of(loginUser));
         webSocketMessageDto.setMessage(message.getPayload());
         WebSocketUtils.publishMessage(webSocketMessageDto);
     }
@@ -100,13 +106,16 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
      */
     @Override
     public void afterConnectionClosed(WebSocketSession session, CloseStatus status) {
-        LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
+//        LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
-        if (ObjectUtil.isNull(loginUser)) {
+        Long loginUser = (Long) session.getAttributes().get(PROJECT_ID);
+//        if (ObjectUtil.isNull(loginUser)) {
+        if (loginUser != null ) {
             log.info("[disconnect] invalid token received. sessionId: {}", session.getId());
             return;
         }
-        WebSocketSessionHolder.removeSession(loginUser.getUserId());
+//        WebSocketSessionHolder.removeSession(loginUser.getUserId());
-        log.info("[disconnect] sessionId: {},userId:{},userType:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType());
+        WebSocketSessionHolder.removeSession(loginUser);
+//        log.info("[disconnect] sessionId: {},userId:{},userType:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType());
     }
 
     /**

xinnengyuan/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java

@@ -15,6 +15,7 @@ import org.springframework.web.socket.server.HandshakeInterceptor;
 import java.util.Map;
 
 import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY;
+import static org.dromara.common.websocket.constant.WebSocketConstants.PROJECT_ID;
 
 /**
  * WebSocket握手请求的拦截器
@@ -44,6 +45,8 @@ public class PlusWebSocketInterceptor implements HandshakeInterceptor {
             String headerCid = ServletUtils.getRequest().getHeader(LoginHelper.CLIENT_KEY);
             String paramCid = ServletUtils.getParameter(LoginHelper.CLIENT_KEY);
             String clientId = StpUtil.getExtra(LoginHelper.CLIENT_KEY).toString();
+            String projectIdStr = ServletUtils.getRequest().getParameter("projectId");
+            Long projectId = Long.parseLong(projectIdStr);
             if (!StringUtils.equalsAny(clientId, headerCid, paramCid)) {
                 // token 无效
                 throw NotLoginException.newInstance(StpUtil.getLoginType(),
@@ -52,6 +55,7 @@ public class PlusWebSocketInterceptor implements HandshakeInterceptor {
             }
 
             attributes.put(LOGIN_USER_KEY, loginUser);
+            attributes.put(PROJECT_ID,projectId);
             return true;
         } catch (NotLoginException e) {
             log.error("WebSocket 认证失败'{}',无法访问系统资源", e.getMessage());

xinnengyuan/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java

@@ -26,7 +26,7 @@ public class WebSocketTopicListener implements ApplicationRunner, Ordered {
     public void run(ApplicationArguments args) throws Exception {
         // 订阅WebSocket消息
         WebSocketUtils.subscribeMessage((message) -> {
-            log.info("WebSocket主题订阅收到消息session keys={} message={}", message.getSessionKeys(), message.getMessage());
+//            log.info("WebSocket主题订阅收到消息session keys={} message={}", message.getSessionKeys(), message.getMessage());
             // 如果key不为空就按照key发消息 如果为空就群发
             if (CollUtil.isNotEmpty(message.getSessionKeys())) {
                 message.getSessionKeys().forEach(key -> {

xinnengyuan/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java

@@ -69,8 +69,8 @@ public class WebSocketUtils {
             broadcastMessage.setMessage(webSocketMessage.getMessage());
             broadcastMessage.setSessionKeys(unsentSessionKeys);
             RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> {
-                log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}",
+//                log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}",
-                    WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage());
+//                    WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage());
             });
         }
     }
@@ -84,7 +84,7 @@ public class WebSocketUtils {
         WebSocketMessageDto broadcastMessage = new WebSocketMessageDto();
         broadcastMessage.setMessage(message);
         RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> {
-            log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message);
+//            log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message);
         });
     }
 

xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml

@@ -42,7 +42,7 @@ snail-job:
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://192.168.110.119:9090/admin
   instance:
     service-host-type: IP

xinnengyuan/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml

@@ -2,9 +2,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://192.168.110.2:13386/xinnengyuan?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-    username: root
+    username: xinnengyuan
-    password: root
+    password: mEZPC5Sdf3r2HENi
     hikari:
       connection-timeout: 30000
       validation-timeout: 5000
@@ -42,8 +42,8 @@ snail-job:
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
-  url: http://localhost:9090/admin
+  url: http://192.168.110.2:19191/admin
   instance:
     service-host-type: IP
     metadata:

xinnengyuan/ruoyi-modules/ruoyi-system/pom.xml

@@ -17,6 +17,39 @@
 
 
     <dependencies>
+
+        <!-- Java WebSocket 标准API -->
+<!--        <dependency>-->
+<!--            <groupId>javax.websocket</groupId>-->
+<!--            <artifactId>javax.websocket-api</artifactId>-->
+<!--            <version>1.1</version>-->
+<!--            <scope>provided</scope>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>com.drewnoakes</groupId>-->
+<!--            <artifactId>metadata-extractor</artifactId>-->
+<!--            <version>2.18.0</version>-->
+<!--        </dependency>-->
+
+
+<!--        <dependency>-->
+<!--            <groupId>technology.tabula</groupId>-->
+<!--            <artifactId>tabula</artifactId>-->
+<!--            <version>1.0.4</version>-->
+<!--        </dependency>-->
+
+
         <!-- JSON解析（FastJSON） -->
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -73,18 +106,32 @@
         </dependency>
 
         <!-- 在pdf上生成二维码 -->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>layout</artifactId>
+            <version>7.2.5</version>
+        </dependency>
+        <!-- iText 7 核心模块（必须，layout依赖此模块） -->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>kernel</artifactId>
+            <version>7.2.5</version> <!-- 与layout版本严格一致 -->
+        </dependency>
+
+
+
         <!--  支持中文字体  -->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.itextpdf</groupId>
+<!--            <groupId>com.itextpdf</groupId>-->
-            <artifactId>itext-asian</artifactId>
+<!--            <artifactId>itext-asian</artifactId>-->
-            <version>5.2.0</version>
+<!--            <version>5.2.0</version>-->
-        </dependency>
+<!--        </dependency>-->
-        <!--  iText  -->
+<!--        &lt;!&ndash;  iText  &ndash;&gt;-->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.itextpdf</groupId>
+<!--            <groupId>com.itextpdf</groupId>-->
-            <artifactId>itextpdf</artifactId>
+<!--            <artifactId>itextpdf</artifactId>-->
-            <version>5.5.13.3</version>
+<!--            <version>5.5.13.3</version>-->
-        </dependency>
+<!--        </dependency>-->
         <!--  ZXing  -->
         <dependency>
             <groupId>com.google.zxing</groupId>
@@ -108,6 +155,11 @@
             <artifactId>ruoyi-common-doc</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-job</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-mybatis</artifactId>
@@ -216,6 +268,24 @@
             <version>5.3.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.25.0-GA</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version> <!-- 最新版本可自行调整 -->
+        </dependency>
 
     </dependencies>
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java

@@ -0,0 +1,144 @@
+package org.dromara.app.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.app.domain.SysPackage;
+import org.dromara.app.service.SysPackageServiceImpl;
+import org.dromara.common.core.domain.R;
+import org.dromara.system.domain.vo.SysOssVo;
+import org.dromara.system.service.impl.SysOssServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/app/sysPackage")
+public class SysPackageController {
+
+    @Autowired
+    private SysOssServiceImpl sysOssService;
+    @Autowired
+    private SysPackageServiceImpl sysPackageService;
+
+    /**
+     * 获取最新版本
+     */
+    @GetMapping("/getNewVersion")
+    public R<SysPackage> getNewVersion() {
+        LambdaQueryWrapper<SysPackage> lambdaQueryWrapper =new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.orderByDesc(SysPackage::getCreateTime);
+        lambdaQueryWrapper.last("LIMIT 1");
+        SysPackage one = sysPackageService.getOne(lambdaQueryWrapper);
+        return R.ok(one);
+    }
+
+    /**
+     * 上传最新安装包及版本
+     */
+    @GetMapping("/uploadNewVersion")
+    public R<SysPackage> uploadNewVersion(String version, String type, MultipartFile file) {
+        String originalFileName = "apk/package/app-release.apk";
+
+        // 先查询最新记录
+        LambdaQueryWrapper<SysPackage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.orderByDesc(SysPackage::getCreateTime);
+        List<SysPackage> list = sysPackageService.list(lambdaQueryWrapper);
+
+        // 分离事务：先处理文件上传
+        SysOssVo upload = sysOssService.upload(file, originalFileName);
+        if (upload == null) {
+            return R.fail("上传失败");
+        }
+
+        // 分离事务：再处理数据库操作
+        return handleDatabaseOperations(version, type, upload, list);
+    }
+
+    @Transactional
+    public R<SysPackage> handleDatabaseOperations(String version, String type, SysOssVo upload, List<SysPackage> existingPackages) {
+        try {
+            // 先删除旧文件记录
+            if (existingPackages != null && !existingPackages.isEmpty()) {
+                SysPackage first = existingPackages.getFirst();
+                Boolean b = sysOssService.deleteWithValidByIds(List.of(first.getFileId()), false);
+                if (!b) {
+                    log.error("通过IDS删除文件失败");
+                }
+            }
+
+            // 保存新记录
+            SysPackage sysPackage = new SysPackage();
+            sysPackage.setVersion(version);
+            sysPackage.setFileId(upload.getOssId());
+            sysPackage.setFileUrl(upload.getUrl());
+            sysPackage.setType(type);
+
+            boolean save = sysPackageService.save(sysPackage);
+            if (!save) {
+                return R.fail("保存失败");
+            }
+
+            return R.ok(sysPackage);
+        } catch (Exception e) {
+            log.error("数据库操作失败", e);
+            throw e; // 重新抛出异常触发事务回滚
+        }
+    }
+//    public R<SysPackage> uploadNewVersion(String version, String type, MultipartFile file) {
+//        String originalFileName = "apk/package/app-release.apk";
+//
+//        //覆盖失败，先删除文件
+//        LambdaQueryWrapper<SysPackage> lambdaQueryWrapper =new LambdaQueryWrapper<>();
+//        lambdaQueryWrapper.orderByDesc(SysPackage::getCreateTime);
+//        List<SysPackage> list = sysPackageService.list(lambdaQueryWrapper);
+//        if (list != null && !list.isEmpty()){
+//            SysPackage first = list.getFirst();
+//            Boolean b = sysOssService.deleteWithValidByIds(List.of(first.getFileId()), false);
+//            if (!b){
+//                log.error("通过IDS删除文件失败");
+//            }
+//        }
+//
+//        SysOssVo upload = sysOssService.upload(file, originalFileName);
+//        if (upload == null){
+//            return R.fail("上传失败");
+//        }
+//        SysPackage sysPackage = new SysPackage();
+//        sysPackage.setVersion( version);
+//        sysPackage.setFileId(upload.getOssId());
+//        sysPackage.setFileUrl(upload.getUrl());
+//        sysPackage.setType(type);
+//
+//        boolean save = sysPackageService.save(sysPackage);
+//        if (!save){
+//            return R.fail("保存失败");
+//        }
+//
+//        return R.ok(sysPackage);
+//    }
+
+
+    /**
+     * 删除 现在指向的是同一个文件
+     */
+    @Transactional
+    @GetMapping("/remove")
+    public R<Void> remove(Long id){
+        SysPackage byId = sysPackageService.getById(id);
+        Boolean b1 = sysOssService.deleteWithValidByIds(List.of(byId.getFileId()), false);
+        boolean b = sysPackageService.removeById(id);
+        if (b1 && b){
+            return R.ok();
+        }
+        return R.fail("删除文件或记录失败");
+    }
+
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/SysPackage.java

@@ -0,0 +1,33 @@
+package org.dromara.app.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+@Data
+@TableName("sys_package")
+@EqualsAndHashCode(callSuper = true)
+public class SysPackage extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 0安卓1苹果2鸿蒙
+     */
+    private String type;
+
+    private String version;
+
+    private Long fileId;
+
+    private String fileUrl;
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/domain/vo/SysPackageVo.java

@@ -0,0 +1,30 @@
+package org.dromara.app.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.app.domain.SysPackage;
+
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysPackage.class)
+public class SysPackageVo {
+
+    @ExcelProperty("id")
+    private Long id;
+
+    /**
+     * 0安卓1苹果2鸿蒙
+     */
+    @ExcelProperty("安装包类型(0安卓1苹果2鸿蒙)")
+    private String type;
+
+    @ExcelProperty("版本")
+    private String version;
+
+    private Long fileId;
+
+    @ExcelProperty("安装包地址")
+    private String fileUrl;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/mapper/SysPackageMapper.java

@@ -0,0 +1,11 @@
+package org.dromara.app.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.app.domain.SysPackage;
+import org.dromara.app.domain.vo.SysPackageVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+@Mapper
+public interface SysPackageMapper extends BaseMapperPlus<SysPackage, SysPackageVo> {
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/service/SysPackageServiceImpl.java

@@ -0,0 +1,10 @@
+package org.dromara.app.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.app.domain.SysPackage;
+import org.dromara.app.mapper.SysPackageMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SysPackageServiceImpl extends ServiceImpl<SysPackageMapper, SysPackage> {
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusBiddingLimitListController.java

@@ -3,7 +3,9 @@ package org.dromara.bidding.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotNull;
+import org.apache.pdfbox.pdmodel.PDDocument;
 import lombok.RequiredArgsConstructor;
+import org.apache.pdfbox.pdmodel.PDDocument;
 import org.dromara.bidding.domain.bo.BusBiddingLimitListBo;
 import org.dromara.bidding.domain.bo.BiddingAllVersionNumbersReq;
 import org.dromara.bidding.domain.vo.BusBiddingLimitListVo;
@@ -22,6 +24,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -38,6 +42,8 @@ public class BusBiddingLimitListController extends BaseController {
 
     private final IBusBiddingLimitListService busBiddingLimitListService;
 
+
+
     /**
      * 查询成本-投标列表
      */
@@ -101,8 +107,8 @@ public class BusBiddingLimitListController extends BaseController {
     @Log(title = "成本-投标", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/importExcelFile")
-    public R<Void> importExcelFile(Long projectId, @RequestParam("file") MultipartFile file) {
+    public R<Void> importExcelFile(BusBiddingLimitListBo bo, @RequestParam("file") MultipartFile file) {
-        return toAjax(busBiddingLimitListService.importExcelFile(projectId, file));
+        return toAjax(busBiddingLimitListService.importExcelFile(bo, file));
     }
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/BusBiddingLimitVersions.java

@@ -42,6 +42,14 @@ public class BusBiddingLimitVersions extends BaseEntity {
      */
     private String versions;
 
+
+    /**
+     * 版本号名称
+     */
+    private String versionsName;
+
+
+
     /**
      * excel文件
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BusBiddingLimitListBo.java

@@ -1,5 +1,6 @@
 package org.dromara.bidding.domain.bo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.bidding.domain.BusBiddingLimitList;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -91,4 +92,6 @@ public class BusBiddingLimitListBo extends BaseEntity {
     private String remark;
 
 
+    private Long type;
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/bo/BusBiddingLimitVersionsBo.java

@@ -44,6 +44,14 @@ public class BusBiddingLimitVersionsBo extends BaseEntity {
     @NotBlank(message = "版本号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String versions;
 
+
+    /**
+     * 版本号名称
+     */
+    private String versionsName;
+
+
+
     /**
      * excel文件
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusBiddingLimitListVo.java

@@ -1,5 +1,6 @@
 package org.dromara.bidding.domain.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import org.dromara.bidding.domain.BusBiddingLimitList;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -77,6 +78,7 @@ public class BusBiddingLimitListVo implements Serializable {
      * 名称
      */
     @ExcelProperty(value = "名称")
+    @ColumnWidth(50)
     private String name;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/domain/vo/BusBiddingLimitVersionsVo.java

@@ -52,6 +52,14 @@ public class BusBiddingLimitVersionsVo implements Serializable {
     @ExcelProperty(value = "版本号")
     private String versions;
 
+
+    /**
+     * 版本号名称
+     */
+    private String versionsName;
+
+
+
     /**
      * excel文件
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitListService.java

@@ -79,7 +79,7 @@ public interface IBusBiddingLimitListService extends IService<BusBiddingLimitLis
      */
     List<BusBiddingLimitListVo> getTree(BusBiddingLimitListBo bo);
 
-    Boolean importExcelFile(Long projectId, MultipartFile file);
+    Boolean importExcelFile(BusBiddingLimitListBo projectId, MultipartFile file);
 
     List<BusBiddingLimitVersionsVo> obtainAllVersionNumbers(BiddingAllVersionNumbersReq bo);
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/IBusBiddingLimitVersionsService.java

@@ -1,5 +1,7 @@
 package org.dromara.bidding.service;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import org.dromara.bidding.domain.vo.BusBiddingLimitVersionsVo;
 import org.dromara.bidding.domain.bo.BusBiddingLimitVersionsBo;
 import org.dromara.bidding.domain.BusBiddingLimitVersions;
@@ -67,4 +69,8 @@ public interface IBusBiddingLimitVersionsService extends IService<BusBiddingLimi
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    BusBiddingLimitVersions queryByProjectId( String versions, Long projectId);
+
+    BusBiddingLimitVersions getByProjectIdVersions(Long projectId, String versions);
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitListServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.bidding.domain.BusBiddingLimitList;
+import org.dromara.bidding.domain.BusBiddingLimitVersions;
 import org.dromara.bidding.domain.bo.BusBiddingLimitListBo;
 import org.dromara.bidding.domain.bo.BusBiddingLimitVersionsBo;
 import org.dromara.bidding.domain.bo.BiddingAllVersionNumbersReq;
@@ -17,14 +18,13 @@ import org.dromara.bidding.mapper.BusBiddingLimitListMapper;
 import org.dromara.bidding.service.IBusBiddingLimitListService;
 import org.dromara.bidding.service.IBusBiddingLimitVersionsService;
 import org.dromara.common.core.constant.HttpStatus;
+import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.utils.excel.ExcelDynamicReader;
-import org.dromara.tender.domain.BusBillofquantitiesLimitList;
-import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -179,13 +179,17 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl<BusBiddingLimitL
 
     @Override
     public List<BusBiddingLimitListVo> getTree(BusBiddingLimitListBo bo) {
+        BusBiddingLimitVersions biddingLimitVersions =  busBiddingLimitVersionsService.queryByProjectId(bo.getVersions(),bo.getProjectId());
+        if (biddingLimitVersions == null || (bo.getType() == 1L && !BusinessStatusEnum.FINISH.getStatus().equals(biddingLimitVersions.getStatus()))) {
+            return null;
+        }
         //获取所有数据
         List<BusBiddingLimitListVo> listVoList = queryList(bo);
         //过滤数量和单价为空的数据并计算总价
         listVoList.stream().filter(vo -> vo.getUnitPrice() != null && vo.getUnitPrice().compareTo(BigDecimal.ZERO) != 0)
             .filter(vo -> vo.getQuantity() != null && vo.getQuantity().compareTo(BigDecimal.ZERO) != 0)
             .forEach(item -> {
-                item.setPrice(item.getUnitPrice().multiply(item.getQuantity()).setScale(2, RoundingMode.HALF_UP));
+                item.setPrice(item.getUnitPrice().multiply(item.getQuantity()).setScale(4, RoundingMode.HALF_UP));
             });
 
         //构建父子映射
@@ -217,7 +221,7 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl<BusBiddingLimitL
         // 如果是叶子节点，计算 price = quantity * unitPrice
         if (node.getChildren().isEmpty()) {
             if (node.getQuantity() != null && node.getUnitPrice() != null) {
-                node.setPrice(node.getQuantity().multiply(node.getUnitPrice()));
+                node.setPrice(node.getQuantity().multiply(node.getUnitPrice()).setScale(4, RoundingMode.HALF_UP));
             } else {
                 node.setPrice(BigDecimal.ZERO); // 默认值
             }
@@ -226,14 +230,22 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl<BusBiddingLimitL
             BigDecimal totalPrice = node.getChildren().stream()
                 .map(BusBiddingLimitListVo::getPrice)
                 .reduce(BigDecimal.ZERO, BigDecimal::add)
-                .setScale(2, RoundingMode.HALF_UP);
+                .setScale(4, RoundingMode.HALF_UP);
             node.setPrice(totalPrice);
         }
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean importExcelFile(Long projectId, MultipartFile file) {
+    public Boolean importExcelFile(BusBiddingLimitListBo bo, MultipartFile file) {
+        BusBiddingLimitVersions biddingLimitVersions = busBiddingLimitVersionsService.getByProjectIdVersions(bo.getProjectId(),bo.getVersions());
+
+        if (biddingLimitVersions == null) {
+            throw new ServiceException("版本号不存在！！！");
+        }
+        if (BusinessStatusEnum.FINISH.getStatus().equals(biddingLimitVersions.getStatus())) {
+            throw new ServiceException("数据已审核完成，不允许修改！！！");
+        }
 
         // 跳过1行（表头），读取0到6列（共7列），映射到ExcelData实体类
         List<BusBiddingLimitListBo> dataList = null;
@@ -242,7 +254,7 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl<BusBiddingLimitL
                 file,          // 上传的文件
                 1,             // 跳过1行（表头）
                 0,             // 从第0列开始
-                12,             // 到第12列结束
+                13,             // 到第12列结束
                 BusBiddingLimitListBo.class // 目标实体类
             );
         } catch (Exception e) {
@@ -265,7 +277,6 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl<BusBiddingLimitL
             busBillofquantities.add(limitList);
         });
         log.info(busBillofquantities.toString());
-
         return this.updateBatchById(busBillofquantities);
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/service/impl/BusBiddingLimitVersionsServiceImpl.java

@@ -1,30 +1,29 @@
 package org.dromara.bidding.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.bidding.domain.BusBiddingLimitVersions;
+import org.dromara.bidding.domain.bo.BusBiddingLimitVersionsBo;
+import org.dromara.bidding.domain.vo.BusBiddingLimitVersionsVo;
+import org.dromara.bidding.mapper.BusBiddingLimitVersionsMapper;
+import org.dromara.bidding.service.IBusBiddingLimitVersionsService;
 import org.dromara.common.core.domain.event.ProcessDeleteEvent;
 import org.dromara.common.core.domain.event.ProcessEvent;
 import org.dromara.common.core.domain.event.ProcessTaskEvent;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.dromara.design.domain.BusBillofquantitiesVersions;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
-import org.dromara.bidding.domain.bo.BusBiddingLimitVersionsBo;
-import org.dromara.bidding.domain.vo.BusBiddingLimitVersionsVo;
-import org.dromara.bidding.domain.BusBiddingLimitVersions;
-import org.dromara.bidding.mapper.BusBiddingLimitVersionsMapper;
-import org.dromara.bidding.service.IBusBiddingLimitVersionsService;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 成本- 投标版本Service业务层处理
@@ -139,6 +138,20 @@ public class BusBiddingLimitVersionsServiceImpl extends ServiceImpl<BusBiddingLi
         return baseMapper.deleteByIds(ids) > 0;
     }
 
+    @Override
+    public BusBiddingLimitVersions queryByProjectId(String versions, Long projectId) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<BusBiddingLimitVersions>()
+            .eq(BusBiddingLimitVersions::getProjectId, projectId)
+            .eq(BusBiddingLimitVersions::getVersions, versions));
+    }
+
+    @Override
+    public BusBiddingLimitVersions getByProjectIdVersions(Long projectId, String versions) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<BusBiddingLimitVersions>()
+            .eq(BusBiddingLimitVersions::getProjectId, projectId)
+            .eq(BusBiddingLimitVersions::getVersions, versions));
+    }
+
 
     /**
      * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
@@ -147,7 +160,7 @@ public class BusBiddingLimitVersionsServiceImpl extends ServiceImpl<BusBiddingLi
      *
      * @param processEvent 参数
      */
-    @org.springframework.context.event.EventListener(condition = "#processEvent.flowCode.endsWith('biddingLimitList')")
+    @EventListener(condition = "#processEvent.flowCode.endsWith('biddingLimitList')")
     public void processPlansHandlErequipmentList(ProcessEvent processEvent) {
         log.info("物资设备清单审核任务执行了{}", processEvent.toString());
         String id = processEvent.getBusinessId();
@@ -177,7 +190,7 @@ public class BusBiddingLimitVersionsServiceImpl extends ServiceImpl<BusBiddingLi
      *
      * @param processTaskEvent 参数
      */
-    @org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('biddingLimitList')")
+    @EventListener(condition = "#processTaskEvent.flowCode.endsWith('biddingLimitList')")
     public void processTaskPlansHandlerEquipmentList(ProcessTaskEvent processTaskEvent) {
         log.info("物资设备清单审核任务创建了{}", processTaskEvent.toString());
     }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/config/RedisConfig.java

@@ -0,0 +1,56 @@
+package org.dromara.bigscreen.config;
+
+import jakarta.annotation.Resource;
+import org.dromara.bigscreen.listener.RedisMessageListener;
+import org.dromara.drone.service.IDroProjectDroneService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.listener.PatternTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
+
+import java.util.List;
+
+@Configuration
+public class RedisConfig {
+
+    @Resource
+    @Lazy
+    private IDroProjectDroneService droProjectDroneService;
+
+    /**
+     * 配置Redis消息监听容器
+     */
+    @Bean
+    public RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory,
+                                                   MessageListenerAdapter listenerAdapter) {
+
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+//        List<String> wrjKeys = droProjectDroneService.getTopicsByKeyPrefix();
+//        for (String key : wrjKeys) {
+//            // 订阅 wrj:8UUXN4P00A06NK 频道
+//            container.addMessageListener(listenerAdapter, new PatternTopic("wrj:osd4"+key));
+//        }
+        return container;
+    }
+
+    /**
+     * 配置消息监听适配器，将消息转发给自定义的监听器
+     */
+    @Bean
+    public MessageListenerAdapter listenerAdapter(RedisMessageListener listener) {
+        return new MessageListenerAdapter(listener);
+    }
+
+    /**
+     * 配置StringRedisTemplate
+     */
+    @Bean
+    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory connectionFactory) {
+        return new StringRedisTemplate(connectionFactory);
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java

@@ -0,0 +1,261 @@
+package org.dromara.bigscreen.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import jakarta.annotation.Resource;
+import org.dromara.bigscreen.domain.dto.WeatherQueryReq;
+import org.dromara.bigscreen.domain.vo.*;
+import org.dromara.bigscreen.mapper.ProjectBigScreenMapper;
+import org.dromara.bigscreen.service.EnterpriseBigScreenService;
+import org.dromara.common.core.domain.R;
+import org.dromara.manager.weathermanager.vo.WeatherVo;
+import org.dromara.project.domain.BusAttendance;
+import org.dromara.project.domain.BusProject;
+import org.dromara.project.domain.BusUserProjectRelevancy;
+import org.dromara.project.service.IBusAttendanceService;
+import org.dromara.project.service.IBusProjectService;
+import org.dromara.project.service.IBusUserProjectRelevancyService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 企业级大屏
+ *
+ * @author lilemy
+ * @date 2025-09-09 14:55
+ */
+@Validated
+@RestController
+@RequestMapping("/enterprise/big/screen")
+public class EnterpriseBigScreenController {
+
+    @Resource
+    private EnterpriseBigScreenService enterpriseBigScreenService;
+
+    @Resource
+    private IBusUserProjectRelevancyService userProjectRelevancyService;
+
+    @Resource
+    private IBusAttendanceService attendanceService;
+
+    @Resource
+    private IBusProjectService projectService;
+
+    /**
+     * 获取关键指标
+     */
+//    @SaCheckPermission("enterprise:bigScreen:keyIndex")
+    @GetMapping("/keyIndex")
+    public R<EnterpriseKeyIndexVo> getEnterpriseKeyIndex() {
+        return R.ok(enterpriseBigScreenService.getEnterpriseKeyIndex());
+    }
+
+    /**
+     * 项目进度分析
+     */
+//    @SaCheckPermission("enterprise:bigScreen:projectProgress")
+    @GetMapping("/projectProgress")
+    public R<ProjectProgressAnalysisVo> getProjectProgress() {
+        return R.ok(enterpriseBigScreenService.getProjectProgressAnalysis());
+    }
+
+    /**
+     * 项目产值对比
+     */
+//    @SaCheckPermission("enterprise:bigScreen:projectOutputValueComparison")
+    @GetMapping("/projectOutputValueComparison")
+    public R<List<OutputValueComparisonVo>> getProjectOutputValueComparison() {
+        return R.ok(enterpriseBigScreenService.getProjectOutputValueComparison());
+    }
+
+    /**
+     * 项目进度完成度和计划容量
+     */
+//    @SaCheckPermission("enterprise:bigScreen:projectProgressCapacity")
+    @GetMapping("/projectProgressCapacity")
+    public R<List<ProjectProgressCapacityVo>> getProjectProgressCapacity() {
+        return R.ok(enterpriseBigScreenService.getProjectProgressCapacity());
+    }
+
+    /**
+     * 风险预警
+     */
+//    @SaCheckPermission("enterprise:bigScreen:riskEarlyWarning")
+    @GetMapping("/riskEarlyWarning")
+    public R<List<RiskEarlyWarningVo>> getRiskEarlyWarning() {
+        return R.ok(enterpriseBigScreenService.getRiskEarlyWarning());
+    }
+
+    /**
+     * 查询天气
+     */
+//    @SaCheckPermission("enterprise:bigScreen:weather")
+    @GetMapping("/weather")
+    public R<List<WeatherVo>> getProjectWeather(WeatherQueryReq req) {
+        return R.ok(enterpriseBigScreenService.getWeather3DaysList(req));
+    }
+
+    /**
+     * 查询安全天数
+     */
+//    @SaCheckPermission("enterprise:bigScreen:safetyDay")
+    @GetMapping("/safetyDay")
+    public R<Long> getProjectSafetyDay() {
+        LocalDate date = LocalDate.of(2023, 1, 1);
+        LocalDate now = LocalDate.now();
+        long days = Math.abs(ChronoUnit.DAYS.between(date, now));
+        return R.ok(days);
+    }
+
+    /**
+     * 人数统计
+     */
+//    @SaCheckPermission("enterprise:bigScreen:peopleCount")
+    @GetMapping("/peopleCount")
+    public R<PeopleCountVo> getProjectPeopleCount() {
+        PeopleCountVo peopleCountVo = new PeopleCountVo();
+
+        List<BusUserProjectRelevancy> list = userProjectRelevancyService.list();
+        //0系统管理员 1普通人员 2项目管理员 3分包人员
+        peopleCountVo.setConstructionPersonnelCount(list.stream().filter(item -> "1".equals(item.getUserType()))
+            .map(BusUserProjectRelevancy::getUserId)
+            .distinct().count());
+
+        peopleCountVo.setManagersCount(list.stream().filter(item -> "2".equals(item.getUserType()))
+            .map(BusUserProjectRelevancy::getUserId)
+            .distinct().count());
+//        peopleCountVo.setManagersCount(69L);
+
+        peopleCountVo.setSubcontractorsCount(list.stream().filter(item -> "3".equals(item.getUserType()))
+            .map(BusUserProjectRelevancy::getUserId)
+            .distinct().count());
+
+//        peopleCountVo.setManagersCount(9L);
+
+//        Integer projectUserCount = projectBigScreenMapper.getUserCount();
+//        peopleCountVo.setConstructionPersonnelCount(Long.valueOf(projectUserCount));
+        return R.ok(peopleCountVo);
+    }
+
+
+    /**
+     * 出勤人数统计
+     */
+//    @SaCheckPermission("enterprise:bigScreen:allAttendanceCount")
+    @GetMapping("/allAttendanceCount")
+    public R<TodayAttendanceCountVo> getAllAttendanceCount() {
+        TodayAttendanceCountVo todayAttendanceCountVo = new TodayAttendanceCountVo();
+//        List<BusProject> projectList = projectService.listByIds(List.of(1897160897167638529L, 1897161054676336641L));
+//        Integer countUser = 0;
+//        Integer countAttendance = 0;
+//        for (BusProject project : projectList) {
+//            Long projectId = project.getGoId();
+//            countUser = countUser + projectBigScreenMapper.getProjectUserCount(projectId);
+//            countAttendance = countAttendance + projectBigScreenMapper.getAttendanceCount(projectId, DateUtils.getDate());
+//        }
+        List<BusAttendance> list = attendanceService.list(Wrappers.<BusAttendance>lambdaQuery()
+            .eq(BusAttendance::getClockDate, LocalDate.now())
+            .in(BusAttendance::getClockStatus, Arrays.asList("1", "2", "3"))
+        );
+
+        long attendanceCount = list.stream().map(BusAttendance::getUserId).distinct().count();
+        todayAttendanceCountVo.setAttendanceCount(attendanceCount);
+
+        // 查询总人数
+        List<BusUserProjectRelevancy> relevancyList = userProjectRelevancyService.list();
+        long totalUserCount = relevancyList.stream().map(BusUserProjectRelevancy::getUserId).distinct().count();
+
+        // 计算考勤率（保留一位小数）
+        if (totalUserCount > 0) {
+            BigDecimal rate = new BigDecimal(attendanceCount * 100)
+                .divide(new BigDecimal(totalUserCount), 1, RoundingMode.HALF_UP);
+            todayAttendanceCountVo.setAttendanceRate(rate.doubleValue());
+        } else {
+            todayAttendanceCountVo.setAttendanceRate(0.0);
+        }
+        todayAttendanceCountVo.setAttendanceCount(attendanceCount);
+        return R.ok(todayAttendanceCountVo);
+    }
+
+    /**
+     * 每个项目的出勤人数
+     */
+//    @SaCheckPermission("enterprise:bigScreen:projectAttendanceCount")
+    @GetMapping("/projectAttendanceCount")
+    public R<List<ProjectAttendanceCountVo>> getProjectAttendanceCount() {
+
+//        List<BusProject> projectList = projectService.listByIds(List.of(1897160897167638529L, 1897161054676336641L));
+//        return R.ok(projectList.stream().map(busProject -> {
+//            ProjectAttendanceCountVo vo = new ProjectAttendanceCountVo();
+//            vo.setProjectId(busProject.getId());
+//            vo.setProjectName(busProject.getProjectName());
+//            Long projectId = busProject.getGoId();
+//            Integer projectUserCount = projectBigScreenMapper.getProjectUserCount(projectId);
+//            Integer attendanceCount = projectBigScreenMapper.getAttendanceCount(projectId, DateUtils.getDate());
+//            vo.setAttendanceCount(Long.valueOf(attendanceCount));
+//            vo.setAttendanceRate(BigDecimalUtil.toPercentage(BigDecimal.valueOf(attendanceCount), BigDecimal.valueOf(projectUserCount)).doubleValue());
+//            return vo;
+//        }).toList());
+        ArrayList<ProjectAttendanceCountVo> projectAttendanceCountVos = new ArrayList<>();
+        List<BusProject> busProjects = projectService.getBaseMapper().selectList(new LambdaQueryWrapper<BusProject>().eq(BusProject::getPId, 0L).eq(BusProject::getIsDelete, 0));
+        List<Long> projectIds = new ArrayList<>();
+        for (BusProject busProject : busProjects) {
+            projectIds.add(busProject.getId());
+        }
+
+        List<BusAttendance> list = attendanceService.list(Wrappers.<BusAttendance>lambdaQuery()
+            .eq(BusAttendance::getClockDate, LocalDate.now())
+            .in(BusAttendance::getClockStatus, Arrays.asList("1", "2", "3"))
+            .in(BusAttendance::getProjectId, projectIds)
+        );
+        List<BusUserProjectRelevancy> relevancyList = userProjectRelevancyService.list(new LambdaQueryWrapper<BusUserProjectRelevancy>().in(BusUserProjectRelevancy::getProjectId, projectIds));
+
+        // 转换为 Map<projectId, 去重后的 userId 数量>
+        Map<Long, Integer> projectUserCountMap = relevancyList.stream()
+            .collect(Collectors.groupingBy(
+                BusUserProjectRelevancy::getProjectId,
+                Collectors.mapping(
+                    BusUserProjectRelevancy::getUserId,
+                    Collectors.collectingAndThen(
+                        Collectors.toSet(),
+                        Set::size
+                    )
+                )
+            ));
+        for (Long projectId : projectUserCountMap.keySet()) {
+            ProjectAttendanceCountVo projectAttendanceCountVo = new ProjectAttendanceCountVo();
+            BusProject byId = projectService.getById(projectId);
+
+            if (byId == null) {
+                continue;
+            }
+            projectAttendanceCountVo.setProjectName(byId.getProjectName());
+            long count = list.stream().filter(item -> item.getProjectId().equals(projectId))
+                .map(BusAttendance::getUserId)
+                .distinct()
+                .count();
+            Integer i = projectUserCountMap.get(projectId);
+            BigDecimal rate = new BigDecimal("0.0");
+            if (i > 0) {
+                rate = new BigDecimal(count * 100)
+                    .divide(new BigDecimal(projectUserCountMap.get(projectId)), 1, RoundingMode.HALF_UP);
+            }
+            projectAttendanceCountVo.setAttendanceRate(rate.doubleValue());
+            projectAttendanceCountVos.add(projectAttendanceCountVo);
+        }
+
+        return R.ok(projectAttendanceCountVos);
+
+    }
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/MoneyBigScreenController.java

@@ -1,6 +1,5 @@
 package org.dromara.bigscreen.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -11,13 +10,13 @@ import org.dromara.ctr.domain.CtrExpensesContract;
 import org.dromara.ctr.domain.CtrIncomeContract;
 import org.dromara.ctr.service.ICtrExpensesContractService;
 import org.dromara.ctr.service.ICtrIncomeContractService;
+import org.dromara.manager.weathermanager.vo.WeatherVo;
 import org.dromara.out.domain.OutSettlementValueOwner;
 import org.dromara.out.domain.OutSettlementValueSubcontract;
 import org.dromara.out.service.IOutSettlementValueOwnerService;
 import org.dromara.out.service.IOutSettlementValueSubcontractService;
 import org.dromara.project.domain.vo.project.BusProjectGisVo;
 import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo;
-import org.dromara.project.domain.vo.project.BusProjectWeatherVo;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -25,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.temporal.TemporalAdjusters;
@@ -61,7 +61,7 @@ public class MoneyBigScreenController {
     /**
      * 查询项目位置列表
      */
-    @SaCheckPermission("money:bigScreen:projectGis")
+//    @SaCheckPermission("money:bigScreen:projectGis")
     @GetMapping("/project/gis")
     public R<List<BusProjectGisVo>> getProjectGis() {
         return R.ok(moneyBigScreenService.getProjectGis());
@@ -115,7 +115,7 @@ public class MoneyBigScreenController {
                 .last("limit 1")
             );
             if (contract != null && contract.getPayRatio() != null) {
-                actualAmount = actualAmount.add(projectMonthlyAmountMap.get(projectId).multiply(contract.getPayRatio()).divide(HUNDRED));
+                actualAmount = actualAmount.add(projectMonthlyAmountMap.get(projectId).multiply(contract.getPayRatio()).divide(HUNDRED).setScale(4, RoundingMode.HALF_UP));
             }
 
         }
@@ -170,7 +170,7 @@ public class MoneyBigScreenController {
             );
 
             if (contract != null && contract.getPayRatio() != null) {
-                actualAmount = actualAmount.add(projectAmountMap.get(contractCode).multiply(contract.getPayRatio()).divide(HUNDRED));
+                actualAmount = actualAmount.add(projectAmountMap.get(contractCode).multiply(contract.getPayRatio()).setScale(4, RoundingMode.HALF_UP).divide(HUNDRED));
             }
 
         }
@@ -351,7 +351,7 @@ public class MoneyBigScreenController {
                     .last("limit 1")
                 );
                 if (contract != null && contract.getPayRatio() != null) {
-                    incomeAmount = incomeAmount.add(incomeGroupedByProject.get(projectId).multiply(contract.getPayRatio()).divide(HUNDRED));
+                    incomeAmount = incomeAmount.add(incomeGroupedByProject.get(projectId).multiply(contract.getPayRatio()).setScale(4, RoundingMode.HALF_UP).divide(HUNDRED));
                 }
             }
 
@@ -381,7 +381,7 @@ public class MoneyBigScreenController {
                 );
 
                 if (contract != null && contract.getPayRatio() != null) {
-                    expensesAmount = expensesAmount.add(expenseGroupedByContract.get(contractCode).multiply(contract.getPayRatio()).divide(HUNDRED));
+                    expensesAmount = expensesAmount.add(expenseGroupedByContract.get(contractCode).multiply(contract.getPayRatio()).setScale(4, RoundingMode.HALF_UP).divide(HUNDRED));
                 }
             }
 
@@ -449,7 +449,7 @@ public class MoneyBigScreenController {
                     .last("limit 1")
                 );
                 if (contract != null && contract.getPayRatio() != null) {
-                    incomeAmount = incomeAmount.add(incomeGroupedByProject.get(projectId).multiply(contract.getPayRatio()).divide(HUNDRED));
+                    incomeAmount = incomeAmount.add(incomeGroupedByProject.get(projectId).multiply(contract.getPayRatio()).setScale(4, RoundingMode.HALF_UP).divide(HUNDRED));
                 }
             }
 
@@ -479,7 +479,7 @@ public class MoneyBigScreenController {
                 );
 
                 if (contract != null && contract.getPayRatio() != null) {
-                    expensesAmount = expensesAmount.add(expenseGroupedByContract.get(contractCode).multiply(contract.getPayRatio()).divide(HUNDRED));
+                    expensesAmount = expensesAmount.add(expenseGroupedByContract.get(contractCode).multiply(contract.getPayRatio()).setScale(4, RoundingMode.HALF_UP).divide(HUNDRED));
                 }
             }
 
@@ -526,8 +526,6 @@ public class MoneyBigScreenController {
     }
 
 
-
-
     /**
      * 获取当前月份的开始时间和结束时间
      *
@@ -546,9 +544,9 @@ public class MoneyBigScreenController {
     /**
      * 查询项目天气
      */
-    @SaCheckPermission("project:bigScreen:weather")
+//    @SaCheckPermission("project:bigScreen:weather")
     @GetMapping("/weather/{projectId}")
-    public R<List<BusProjectWeatherVo>> getProjectWeather(@NotNull(message = "主键不能为空")
+    public R<List<WeatherVo>> getProjectWeather(@NotNull(message = "主键不能为空")
                                                 @PathVariable Long projectId) {
         return R.ok(moneyBigScreenService.getProjectWeather(projectId));
     }
@@ -556,7 +554,7 @@ public class MoneyBigScreenController {
     /**
      * 查询项目安全天数
      */
-    @SaCheckPermission("project:bigScreen:safetyDay")
+//    @SaCheckPermission("project:bigScreen:safetyDay")
     @GetMapping("/safetyDay/{projectId}")
     public R<BusProjectSafetyDayVo> getProjectSafetyDay(@NotNull(message = "主键不能为空")
                                                         @PathVariable Long projectId) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java

@@ -1,28 +1,50 @@
 package org.dromara.bigscreen.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.dromara.bigscreen.domain.dto.ProjectUpdateDto;
+import org.dromara.bigscreen.domain.dto.TanchuangInfoReq;
+import org.dromara.bigscreen.domain.dto.Ys7DeviceUpdateReq;
 import org.dromara.bigscreen.domain.vo.ProjectImageProgressVo;
 import org.dromara.bigscreen.domain.vo.ProjectLandVo;
 import org.dromara.bigscreen.domain.vo.ProjectPeopleVo;
 import org.dromara.bigscreen.domain.vo.ProjectSafetyInspectionVo;
 import org.dromara.bigscreen.service.ProjectBigScreenService;
+import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.gps.domain.bo.GpsEquipmentBo;
 import org.dromara.land.domain.BusLandBlock;
 import org.dromara.land.domain.BusLandTransferLedger;
+import org.dromara.land.domain.BusLandTransferLedgerSon;
 import org.dromara.land.service.IBusLandBlockService;
 import org.dromara.land.service.IBusLandTransferLedgerService;
+import org.dromara.land.service.impl.BusLandTransferLedgerSonServiceImpl;
+import org.dromara.manager.weathermanager.vo.WeatherVo;
+import org.dromara.manager.ys7manager.Ys7Manager;
+import org.dromara.other.domain.OthYs7Device;
+import org.dromara.other.service.IOthYs7DeviceService;
 import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo;
-import org.dromara.project.domain.vo.project.BusProjectWeatherVo;
 import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo;
+import org.dromara.project.service.IBusProjectNewsService;
+import org.dromara.project.service.IBusProjectService;
+import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionGisReq;
+import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionListGisVo;
+import org.dromara.quality.service.IQltQualityInspectionService;
+import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionGisReq;
+import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo;
+import org.dromara.safety.service.IHseSafetyInspectionService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -40,7 +62,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/project/big/screen")
-public class ProjectBigScreenController {
+public class ProjectBigScreenController extends BaseController {
 
     @Resource
     private ProjectBigScreenService projectBigScreenService;
@@ -49,15 +71,53 @@ public class ProjectBigScreenController {
 
     private final IBusLandBlockService busLandBlockService;
 
+
+    private final IOthYs7DeviceService othYs7DeviceService;
+
+    private final IBusProjectService projectService;
+
+    private final IBusProjectNewsService projectNewsService;
+
+    private final IQltQualityInspectionService qualityInspectionService;
+
+    private final IHseSafetyInspectionService safetyInspectionService;
+
+    private final Ys7Manager ys7Manager;
+
+    private final BusLandTransferLedgerSonServiceImpl busLandTransferLedgerSonService;
+
     /**
      * 查询项目土地统计
      */
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/{projectId}")
     public R<List<ProjectLandVo>> landCount(@NotNull(message = "主键不能为空")
                                             @PathVariable Long projectId) {
         List<BusLandTransferLedger> levelList = busLandTransferLedgerService.list(Wrappers.lambdaQuery(BusLandTransferLedger.class)
             .eq(BusLandTransferLedger::getProjectId, projectId));
 
+        if (CollectionUtil.isNotEmpty(levelList)) {
+            List<Long> list1 = levelList.stream().map(BusLandTransferLedger::getId).toList();
+            LambdaQueryWrapper<BusLandTransferLedgerSon> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.in(BusLandTransferLedgerSon::getParentId, list1);
+            List<BusLandTransferLedgerSon> sonList = busLandTransferLedgerSonService.list(lambdaQueryWrapper);
+            Map<Long, BigDecimal> collect = sonList.stream()
+                .filter(vo -> "1".equals(vo.getTransferStatus()))
+                .collect(Collectors.groupingBy(
+                    BusLandTransferLedgerSon::getParentId,
+                    Collectors.reducing(
+                        BigDecimal.ZERO,
+                        BusLandTransferLedgerSon::getAreaValue,
+                        BigDecimal::add
+                    )
+                ));
+            for (BusLandTransferLedger busLandTransferLedger : levelList) {
+                BigDecimal areaValue = collect.get(busLandTransferLedger.getId());
+                if (areaValue != null) {
+                    busLandTransferLedger.setTransferAea(areaValue);
+                }
+            }
+        }
         // 根据 landBlockId 分组，并对 designArea 和 transferAea 进行求和
         Map<Long, Map<String, BigDecimal>> groupedResult = levelList.stream()
             .collect(Collectors.groupingBy(
@@ -101,9 +161,9 @@ public class ProjectBigScreenController {
     /**
      * 查询项目天气
      */
-    @SaCheckPermission("project:bigScreen:weather")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/weather/{projectId}")
-    public R<List<BusProjectWeatherVo>> getProjectWeather(@NotNull(message = "主键不能为空")
+    public R<List<WeatherVo>> getProjectWeather(@NotNull(message = "主键不能为空")
                                                 @PathVariable Long projectId) {
         return R.ok(projectBigScreenService.getProjectWeather(projectId));
     }
@@ -111,7 +171,7 @@ public class ProjectBigScreenController {
     /**
      * 查询项目安全天数
      */
-    @SaCheckPermission("project:bigScreen:safetyDay")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/safetyDay/{projectId}")
     public R<BusProjectSafetyDayVo> getProjectSafetyDay(@NotNull(message = "主键不能为空")
                                                         @PathVariable Long projectId) {
@@ -121,7 +181,7 @@ public class ProjectBigScreenController {
     /**
      * 查询项目公告
      */
-    @SaCheckPermission("project:bigScreen:news")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/news/{projectId}")
     public R<List<BusProjectNewsVo>> getProjectNews(@NotNull(message = "主键不能为空")
                                                     @PathVariable Long projectId) {
@@ -131,7 +191,7 @@ public class ProjectBigScreenController {
     /**
      * 查询项目AI安全巡检
      */
-    @SaCheckPermission("project:bigScreen:safetyInspection")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/safetyInspection/{projectId}")
     public R<List<ProjectSafetyInspectionVo>> getProjectSafetyInspection(@NotNull(message = "主键不能为空")
                                                                          @PathVariable Long projectId) {
@@ -141,7 +201,7 @@ public class ProjectBigScreenController {
     /**
      * 查询项目人员情况
      */
-    @SaCheckPermission("project:bigScreen:people")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/people/{projectId}")
     public R<ProjectPeopleVo> getProjectPeople(@NotNull(message = "主键不能为空")
                                                @PathVariable Long projectId) {
@@ -151,9 +211,9 @@ public class ProjectBigScreenController {
     /**
      * 查询项目形象进度
      */
-    @SaCheckPermission("project:bigScreen:imageProgress")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/imageProgress/{projectId}")
-    public R<ProjectImageProgressVo> getProjectImageProgress(@NotNull(message = "主键不能为空")
+    public R<List<ProjectImageProgressVo>> getProjectImageProgress(@NotNull(message = "主键不能为空")
                                                                    @PathVariable Long projectId) {
         return R.ok(projectBigScreenService.getProjectImageProgress(projectId));
     }
@@ -161,10 +221,155 @@ public class ProjectBigScreenController {
     /**
      * 查询项目概括
      */
-    @SaCheckPermission("project:bigScreen:generalize")
+//    @SaCheckPermission("project:big:screen")
     @GetMapping("/generalize/{projectId}")
     public R<String> getProjectGeneralize(@NotNull(message = "主键不能为空")
                                           @PathVariable Long projectId) {
         return R.ok(projectBigScreenService.getProjectGeneralize(projectId));
     }
+
+    /**
+     * 查询设备列表
+     */
+//    @SaCheckPermission("project:big:screen")
+    @GetMapping("/getClientList/{projectId}")
+    public R<List<Map<String, Object>>> getClientList(@NotNull(message = "主键不能为空")
+                                                      @PathVariable Long projectId) {
+        return R.ok(projectBigScreenService.getClientList(projectId));
+    }
+
+    /**
+     * 修改萤石摄像头
+     */
+//    @SaCheckPermission("project:big:screen")
+    @RepeatSubmit()
+    @PutMapping("/device")
+    public R<Void> edit(@Validated @RequestBody Ys7DeviceUpdateReq req) {
+        OthYs7Device one = othYs7DeviceService.lambdaQuery()
+            .eq(OthYs7Device::getDeviceSerial, req.getDeviceSerial())
+            .last("limit 1")
+            .one();
+        if (one == null) {
+            throw new ServiceException("萤石摄像头信息不存在", HttpStatus.NOT_FOUND);
+        }
+        // 将实体类和 DTO 进行转换
+        OthYs7Device ys7Device = new OthYs7Device();
+        BeanUtils.copyProperties(req, ys7Device);
+        ys7Device.setId(one.getId());
+        // 判断是否更新名称
+        String deviceName = req.getDeviceName();
+        if (deviceName != null && !deviceName.equals(one.getDeviceName())) {
+            Long count = othYs7DeviceService.lambdaQuery()
+                .eq(OthYs7Device::getDeviceName, req.getDeviceName())
+                .count();
+            if (count > 0) {
+                throw new ServiceException("已存在同名萤石摄像头", HttpStatus.CONFLICT);
+            }
+            // 更新云端名称
+            Boolean result = ys7Manager.updateDeviceName(one.getDeviceSerial(), deviceName);
+            if (!result) {
+                throw new ServiceException("更新云端萤石摄像头名称异常", HttpStatus.ERROR);
+            }
+        }
+        if (req.getLatitude() != null  &&  req.getLongitude() != null) {
+            ys7Device.setLatitude(req.getLatitude());
+            ys7Device.setLongitude(req.getLongitude());
+        }
+        return toAjax(othYs7DeviceService.updateById(ys7Device));
+    }
+
+    /**
+     * 查询质量信息
+     */
+//    @SaCheckPermission("project:big:screen")
+    @GetMapping("/getQualityList/gis")
+    public R<QltQualityInspectionListGisVo> queryGisList(QltQualityInspectionGisReq req) {
+        return R.ok(qualityInspectionService.queryGisList(req));
+    }
+
+    /**
+     * 查询大屏安全信息
+     */
+//    @SaCheckPermission("project:big:screen")
+    @GetMapping("/getSafetyList/gis")
+    public R<HseSafetyInspectionListGisVo> queryGisList(HseSafetyInspectionGisReq req) {
+        return R.ok(safetyInspectionService.queryGisList(req));
+    }
+
+    /**
+     * 查询GPS设备用户列表
+     */
+//    @SaCheckPermission("project:big:screen")
+    @GetMapping("/getList")
+    public R<List<String>> getList(Long projectId) {
+        return R.ok(projectBigScreenService.getList(projectId));
+    }
+
+    /**
+     * 新增GPS设备详细
+     */
+//    @SaCheckPermission("project:big:screen")
+    @Log(title = "GPS设备详细", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/setList")
+    public void setList(@RequestBody GpsEquipmentBo bo) {
+        projectBigScreenService.setList(bo);
+    }
+
+    /**
+     * 查询地图项目分类
+     */
+//    @SaCheckPermission("project:big:screen")
+    @GetMapping("/getProjectMapList")
+    public R<Map<String, Map<String, Map<String, String>>>> getProjectMapList() {
+        return R.ok(projectService.getProjectMapList());
+    }
+
+    /**
+     * 查询地图项目分类
+     */
+//    @SaCheckPermission("project:big:screen")
+    @PostMapping("/updatePosition")
+    public R<Void> updatePosition(@RequestBody ProjectUpdateDto dto) {
+        return toAjax(projectService.updatePosition(dto));
+    }
+
+
+    /**
+     * 查询项目地域分散图
+     */
+//    @SaCheckPermission("project:big:screen")
+    @GetMapping("/getProjectDiYv")
+    public R<Map<String, Long>> getProjectDiYv() {
+        return R.ok(projectService.getProjectDiYv());
+    }
+
+    /**
+     * 计划和实际容量对比
+     */
+//    @SaCheckPermission("project:big:screen")
+    @GetMapping("/getProjectCapacity")
+    public R<Map<String, Map<String, String>>> getProjectCapacity() {
+        return R.ok(projectService.getProjectCapacity());
+    }
+
+
+    /**
+     * 更新无人机缓存
+     */
+//    @SaCheckPermission("project:big:screen")
+    @GetMapping("/setWrjHc")
+    public void setWrjHc() {
+        projectBigScreenService.setWrjHc();
+    }
+
+    /**
+     * 更新无人机缓存
+     */
+//    @SaCheckPermission("project:big:screen")
+    @GetMapping("/getInfoData")
+    public R<Map<String, Map<String, Object>>> getInfoData(TanchuangInfoReq req) {
+        return R.ok(projectBigScreenService.getInfoData(req));
+    }
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusAttendanceByGo.java

@@ -0,0 +1,58 @@
+package org.dromara.bigscreen.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class BusAttendanceByGo {
+
+    private Long id;                 // 主键ID
+
+    private String userName;         // 人员姓名
+
+    private String pacePhoto;        // 人脸照
+
+    private Long projectId;          // 项目id
+
+    private String createBy;         // 创建者
+
+    private String updateBy;         // 更新者
+
+    private LocalDateTime createdAt; // 创建时间
+
+    private LocalDateTime updatedAt; // 更新时间
+
+    private LocalDateTime deletedAt; // 删除时间
+
+    private String clockOn;          // 上午打卡
+
+    private String clockOff;         // 下午打卡
+
+    private String printingDate;     // 年月日打卡时间
+
+    private String isPinch;          // 1正常,2迟到,3早退,4缺勤,5补卡
+
+    private String openid;           // 微信id
+
+    private String pinchOpenId;      // 代打id
+
+    private String clockRecord;      // 多次打卡时间记录
+
+    private String pinchUserName;    // 代打人姓名
+
+    private String commuter;         // 上下班（1上班 2下班）
+
+    private String punchRange;       // 打卡范围
+
+    private BigDecimal dailyWage;    // 日薪
+
+    private String lng;              // 经度
+
+    private String lat;              // 纬度
+
+    private String location;         // 逆编码地址信息
+
+    private LocalDateTime missing;   // 缺卡统一处理时间
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusConstructionUser.java

@@ -0,0 +1,91 @@
+package org.dromara.bigscreen.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("bus_construction_user")
+public class BusConstructionUser {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;                  // 主键ID
+
+    private String openid;            // 微信id
+
+    private String nickName;          // 微信名称
+
+    private Long teamId;              // 班组id
+
+    private String headIcon;          // 登陆照片
+
+    private String pacePhoto;         // 人脸照
+
+    private String userName;          // 人员姓名
+
+    private Long projectId;           // 项目id
+
+    private String status;            // 状态（0在职 1离职）-字典position_status
+
+    private String isPinch;           // 是否代打
+
+    private String ifManagement;      // 是否班组管理
+
+    private String createBy;          // 创建者
+
+    private String updateBy;          // 更新者
+
+    private LocalDateTime createdAt;  // 创建时间
+
+    private LocalDateTime updatedAt;  // 更新时间
+
+    private LocalDateTime deletedAt;  // 删除时间
+
+    private String phone;             // 电话
+
+    private String sex;               // 1:男,2女,3保密
+
+    private String sfzNation;         // 身份证民族
+
+    private String sfzNumber;         // 身份证号码
+
+    private String sfzStart;          // 身份证有效开始期
+
+    private String sfzEnd;            // 身份证有效结束期
+
+    private String sfzSite;           // 身份证地址
+
+    private String sfzBirth;          // 身份证出生日期
+
+    private String nativePlace;       // 籍贯
+
+    private String yhkNumber;         // 银行卡号
+
+    private String yhkOpeningBank;    // 开户行
+
+    private String yhkCardholder;     // 持卡人
+
+    private String typeOfWork;        // 工种（字典）
+
+    private String clock;             // 打卡(1启用打卡 2禁止打卡)
+
+    private Long labourserviceId;     // 劳务公司id
+
+    private String entryDate;         // 入场时间
+
+    private String leaveDate;         // 离场时间
+
+    private BigDecimal salary;        // 薪水（为0表示无效）
+
+    private String projectRecord;     // 是否开启项目备案（1开启 2不开启）
+
+    private String wxOrPc;            // 哪添加的（1表示pc 2表示小程序）
+
+    private String subscription;      // 消息订阅状态（1订阅 2无订阅）
+
+    private String devNum;            // 安全帽设备标识
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusCorporateEvents.java

@@ -0,0 +1,52 @@
+package org.dromara.bigscreen.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 企业大事记
+ */
+@Data
+@TableName("bus_corporate_events")
+public class BusCorporateEvents {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String headline;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 创建人
+     */
+    private Long createdBy;
+
+    /**
+     * 更新人
+     */
+    private Long updatedBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+    /**
+     * 删除时间（软删除标记）
+     */
+    private LocalDateTime deletedAt;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusProjectTeamByGo.java

@@ -0,0 +1,31 @@
+package org.dromara.bigscreen.domain;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class BusProjectTeamByGo {
+
+    private Long id;              // 主键id
+
+    private Long projectId;       // 项目id
+
+    private String name;      // 班组名称
+
+    private String isClockIn;     // 范围内打卡（0范围内打卡 1任何地点打卡）
+
+    private String punchRange;    // 打卡范围(id串)
+
+    private String remark;        // 备注
+
+    private String createBy;      // 创建者
+
+    private String updateBy;      // 更新者
+
+    private Long createDept;      // 创建部门
+
+    private LocalDateTime createTime; // 创建时间
+
+    private LocalDateTime updateTime; // 更新时间
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusProjectTeamMemberByGo.java

@@ -0,0 +1,25 @@
+package org.dromara.bigscreen.domain;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class BusProjectTeamMemberByGo {
+
+    private Long id;              // 主键id
+
+    private Long teamId;          // 班组id
+
+    private Long projectId;       // 项目id
+
+    private Long memberId;        // 施工人员id
+
+    private String postId;        // 岗位（0普通员工，1组长）
+
+    private String remark;        // 备注
+
+    private LocalDateTime createTime; // 创建时间
+
+    private LocalDateTime updateTime; // 更新时间
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusTour.java

@@ -0,0 +1,35 @@
+package org.dromara.bigscreen.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BusTour {
+
+    private Long id;                  // 主键ID
+
+    private Long projectId;           // 项目id
+
+    private String tourCategory;      // 类别字典（如：无人机识别、监控拍摄）
+
+    private String tourType;          // 类型字典（如：安全帽、安全带）
+
+    private String picture;           // 图片路径
+
+    private Integer num;              // 违规数量
+
+    private String describe;          // 故障描述
+
+    private Date createdAt;  // 创建时间
+
+    private Date updatedAt;  // 更新时间
+
+    private Date deletedAt;  // 删除时间
+
+    private String tableName;         // 表名
+
+    private Long tableId;             // 表id
+
+    private String sxtName;           // 摄像头名称
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/SysProjectIntroduce.java

@@ -0,0 +1,34 @@
+package org.dromara.bigscreen.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("sys_project_introduce")
+public class SysProjectIntroduce {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;              // 主键id
+
+    private Long projectId;       // 项目id
+
+    private String headline;      // 标题
+
+    private String richText;      // 富文本
+
+    private String createdBy;     // 创建人
+
+    private String updatedBy;     // 更新人
+
+    private LocalDateTime createdAt; // 创建时间
+
+    private LocalDateTime updatedAt; // 更新时间
+
+    private LocalDateTime deletedAt; // 删除时间
+
+    private String files;         // 附件
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/ProjectUpdateDto.java

@@ -0,0 +1,16 @@
+package org.dromara.bigscreen.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class ProjectUpdateDto implements Serializable {
+
+
+    private Long projectId;       // 项目id
+
+    private String position;      // 图片
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/TanchuangInfoReq.java

@@ -0,0 +1,11 @@
+package org.dromara.bigscreen.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TanchuangInfoReq implements Serializable {
+
+    private Long id;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/WeatherQueryReq.java

@@ -0,0 +1,31 @@
+package org.dromara.bigscreen.domain.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author lilemy
+ * @date 2025-09-09 15:16
+ */
+@Data
+public class WeatherQueryReq implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -2550570761981859666L;
+
+    /**
+     * 经度
+     */
+    @NotBlank(message = "经度不能为空")
+    private String lng;
+
+    /**
+     * 纬度
+     */
+    @NotBlank(message = "纬度不能为空")
+    private String lat;
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/WurenjiQueryReq.java

@@ -0,0 +1,26 @@
+package org.dromara.bigscreen.domain.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author lilemy
+ * @date 2025-09-09 15:16
+ */
+@Data
+public class WurenjiQueryReq {
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/Ys7DeviceUpdateReq.java

@@ -0,0 +1,50 @@
+package org.dromara.bigscreen.domain.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025/6/13 10:19
+ */
+@Data
+public class Ys7DeviceUpdateReq implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -3434796275594146484L;
+
+    /**
+     * 设备序列号
+     */
+    @NotBlank(message = "设备序列号不能为空")
+    private String deviceSerial;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备详情
+     */
+    private String detail;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 纬度（精确到6位小数）
+     */
+    private BigDecimal latitude;
+    /**
+     * 经度（精确到6位小数）
+     */
+    private BigDecimal longitude;
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/EnterpriseKeyIndexVo.java

@@ -0,0 +1,47 @@
+package org.dromara.bigscreen.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-09-09 15:59
+ */
+@Data
+public class EnterpriseKeyIndexVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -3987781906203623727L;
+
+    /**
+     * 光伏项目数量
+     */
+    private Integer photovoltaicCount;
+
+    /**
+     * 风电项目数量
+     */
+    private Integer windElectricityCount;
+
+    /**
+     * 光伏项目总容量
+     */
+    private BigDecimal photovoltaicTotalCapacity;
+
+    /**
+     * 风电项目总容量
+     */
+    private BigDecimal windElectricityTotalCapacity;
+
+    /**
+     * 业绩数量
+     */
+    private Long performanceCount;
+    /**
+     * 典型业绩
+     */
+    private Long typicalPerformance;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/OutputValueComparisonVo.java

@@ -0,0 +1,38 @@
+package org.dromara.bigscreen.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-09-09 19:12
+ */
+@Data
+public class OutputValueComparisonVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -6902563869975528076L;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 计划产值
+     */
+    private BigDecimal planValue;
+
+    /**
+     * 实际产值
+     */
+    private BigDecimal actualValue;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/PeopleCountVo.java

@@ -0,0 +1,22 @@
+package org.dromara.bigscreen.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class PeopleCountVo {
+
+    /**
+     * 施工人员
+     */
+    private Long constructionPersonnelCount;
+
+    /**
+     * 分包人员
+     */
+    private Long SubcontractorsCount;
+
+    /**
+     * 管理人员
+     */
+    private Long managersCount;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/PeopleOverviewVo.java

@@ -0,0 +1,33 @@
+package org.dromara.bigscreen.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-09-09 16:04
+ */
+@Data
+public class PeopleOverviewVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -4353811031023888101L;
+
+    /**
+     * 出勤人数
+     */
+    private Long attendanceNumber;
+
+    /**
+     * 出勤率
+     */
+    private BigDecimal attendanceRate;
+
+    /**
+     * 施工人员数量
+     */
+    private Long constructorNumber;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/ProjectAttendanceCountVo.java

@@ -0,0 +1,29 @@
+package org.dromara.bigscreen.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class ProjectAttendanceCountVo {
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 考勤人数
+     */
+    private Long attendanceCount;
+
+    /**
+     * 考勤率
+     */
+    private Double attendanceRate;
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/ProjectImageProgressVo.java

@@ -16,39 +16,49 @@ public class ProjectImageProgressVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 7963637133004484891L;
 
+    /**
+     * 类别名称
+     */
+    private String progressName;
+
+    /**
+     * 进度百分比
+     */
+    private BigDecimal progressTotal;
+
     /**
      * 场区百分比
      */
-    private BigDecimal areaPercentage;
+//    private BigDecimal areaPercentage;
 
     /**
      * 道路百分比
      */
-    private BigDecimal roadPercentage;
+//    private BigDecimal roadPercentage;
 
     /**
      * 集电线路百分比
      */
-    private BigDecimal collectorLinePercentage;
+//    private BigDecimal collectorLinePercentage;
 
     /**
      * 送出线路百分比
      */
-    private BigDecimal exportLinePercentage;
+//    private BigDecimal exportLinePercentage;
 
     /**
      * 升压站百分比
      */
-    private BigDecimal substationPercentage;
+//    private BigDecimal substationPercentage;
 
     /**
      * 箱变百分比
      */
-    private BigDecimal boxTransformerPercentage;
+//    private BigDecimal boxTransformerPercentage;
 
     /**
      * 总百分比
      */
-    private BigDecimal totalPercentage;
+//    private BigDecimal totalPercentage;
 
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/ProjectProgressAnalysisVo.java

@@ -0,0 +1,39 @@
+package org.dromara.bigscreen.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author lilemy
+ * @date 2025-09-09 16:51
+ */
+@Data
+public class ProjectProgressAnalysisVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -2170524608375159201L;
+
+    /**
+     * 并网总容量 (MW)
+     */
+    private BigDecimal gridConnectedCapacity;
+
+    /**
+     * 计划总容量 (MW)
+     */
+    private BigDecimal plannedCapacity;
+
+    /**
+     * 延期项目数量
+     */
+    private Integer delayedProjectCount;
+
+    /**
+     * 项目进度详情
+     */
+    List<ProjectProgressDetailVo> projectProgressDetailList;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/ProjectProgressCapacityVo.java

@@ -0,0 +1,39 @@
+package org.dromara.bigscreen.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-09-12 18:55
+ */
+@Data
+public class ProjectProgressCapacityVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -7370580195063977801L;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 进度百分比
+     */
+    private BigDecimal progressPercentage;
+
+    /**
+     * 计划容量
+     */
+    private BigDecimal plannedCapacity;
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/ProjectProgressDetailVo.java

@@ -0,0 +1,33 @@
+package org.dromara.bigscreen.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lilemy
+ * @date 2025-09-09 16:55
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProjectProgressDetailVo {
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 项目容量
+     */
+    private BigDecimal projectCapacity;
+
+    /**
+     * 施工进度百分比 (0~100)
+     */
+    private BigDecimal completionRate;
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/RiskEarlyWarningVo.java

@@ -0,0 +1,48 @@
+package org.dromara.bigscreen.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @author lilemy
+ * @date 2025-09-09 20:04
+ */
+@Data
+public class RiskEarlyWarningVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 5250172770638676715L;
+
+    /**
+     * 时间
+     */
+    private LocalDate date;
+
+    /**
+     * 风险类型
+     */
+    private String riskType;
+
+    /**
+     * 报警内容
+     */
+    private String alarmContent;
+
+    /**
+     * 威胁等级
+     */
+    private String dangerLevel;
+
+    /**
+     * 来源
+     */
+    private String source;
+
+    /**
+     * 告警等级
+     */
+    private String alarmLevel;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/TodayAttendanceCountVo.java

@@ -0,0 +1,19 @@
+package org.dromara.bigscreen.domain.vo;
+
+
+import lombok.Data;
+
+@Data
+public class TodayAttendanceCountVo {
+
+    /**
+     * 考勤人员数量
+     */
+     private Long attendanceCount;
+
+     /**
+     * 出勤率
+     */
+     private Double attendanceRate;
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/listener/RedisMessageListener.java

@@ -0,0 +1,92 @@
+package org.dromara.bigscreen.listener;
+
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import jakarta.annotation.Resource;
+import org.dromara.common.websocket.dto.WebSocketMessageDto;
+import org.dromara.common.websocket.utils.WebSocketUtils;
+import org.dromara.drone.domain.DroProjectDrone;
+import org.dromara.drone.service.IDroProjectDroneService;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.Objects;
+
+/**
+ * Redis消息监听器，用于处理订阅频道收到的消息
+ */
+@Component
+public class RedisMessageListener implements MessageListener {
+
+    @Lazy
+    private final StringRedisTemplate stringRedisTemplate;
+
+    @Resource
+    @Lazy
+    private IDroProjectDroneService droProjectDroneService;
+
+    // 构造函数注入StringRedisTemplate
+    public RedisMessageListener(StringRedisTemplate stringRedisTemplate) {
+        this.stringRedisTemplate = stringRedisTemplate;
+    }
+
+    /**
+     * 处理接收到的消息
+     * @param message 消息对象
+     * @param pattern 订阅的模式
+     */
+    @Override
+    public void onMessage(Message message, byte[] pattern) {
+        // 处理消息
+//        System.out.println("返回："+stringRedisTemplate.getStringSerializer().deserialize(message.getBody()));
+        String gateway = JSONUtil.parseObj(stringRedisTemplate.getStringSerializer().deserialize(message.getBody())).getStr("gateway");
+        String key = "";
+        if (JSONUtil.parseObj(stringRedisTemplate.getStringSerializer().deserialize(message.getBody())).getJSONObject("data").get("job_number") != null) {
+            key = "wrj:osd1:"+gateway;
+        }else if (JSONUtil.parseObj(stringRedisTemplate.getStringSerializer().deserialize(message.getBody())).getJSONObject("data").get("wireless_link") != null) {
+            key = "wrj:osd2:"+gateway;
+        }else if (JSONUtil.parseObj(stringRedisTemplate.getStringSerializer().deserialize(message.getBody())).getJSONObject("data").get("network_state") != null) {
+            key = "wrj:osd3:"+gateway;
+            DroProjectDrone droProjectDrone = droProjectDroneService.getBaseMapper().selectOne(new LambdaQueryWrapper<DroProjectDrone>().eq(DroProjectDrone::getDroneSn, gateway));
+            setWs(message, gateway, droProjectDrone);
+        }else{
+            key = "wrj:osd4:"+gateway;
+            DroProjectDrone droProjectDrone = droProjectDroneService.getBaseMapper().selectOne(new LambdaQueryWrapper<DroProjectDrone>().eq(DroProjectDrone::getDroneSn, gateway));
+            setWs(message, gateway, droProjectDrone);
+
+        }
+        stringRedisTemplate
+            .opsForValue()
+            .set(key
+                , Objects.requireNonNull(stringRedisTemplate.getStringSerializer().deserialize(message.getBody())));
+
+    }
+
+    private void setWs(Message message, String gateway, DroProjectDrone droProjectDrone) {
+        String pushContent = buildPushMessage(gateway,stringRedisTemplate.getStringSerializer().deserialize(message.getBody()), droProjectDrone.getProjectId());
+        // 发送给指定用户（equipment.getUserId()）
+        WebSocketMessageDto messageDto = new WebSocketMessageDto();
+        messageDto.setMessage(pushContent);
+        messageDto.setSessionKeys(Collections.singletonList(droProjectDrone.getProjectId()));
+        WebSocketUtils.publishMessage(messageDto);
+    }
+
+    private String buildPushMessage(String key, String message, Long projectId) {
+        JSONObject messageObj = new JSONObject();
+        messageObj.put("type", "wrj_DATA_UPDATE");
+        messageObj.put("projectId",projectId.toString());
+        messageObj.put("clientId",key);
+        // 位置信息
+        JSONObject locationObj = new JSONObject();
+        locationObj.put("latitude", JSONUtil.parseObj(message).getJSONObject("data").get("latitude").toString()); // 纬度
+        locationObj.put("longitude", JSONUtil.parseObj(message).getJSONObject("data").get("longitude").toString()); // 经度
+        messageObj.put("location", locationObj);
+        return messageObj.toString();
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/manager/RedisSubscribeManager.java

@@ -0,0 +1,193 @@
+package org.dromara.bigscreen.manager;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.drone.service.IDroProjectDroneService;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.data.redis.listener.PatternTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * Redis 订阅管理器（定时任务动态更新订阅关系）
+ */
+@Component
+@Slf4j
+public class RedisSubscribeManager {
+
+    // 1. 注入 Redis 核心组件
+    @Resource
+    private RedisMessageListenerContainer redisMessageListenerContainer;
+    @Resource
+    private MessageListenerAdapter redisMessageListenerAdapter;
+
+    // 2. 注入业务 Service（延迟加载，避免循环依赖）
+    @Resource
+    @Lazy
+    private IDroProjectDroneService droProjectDroneService;
+
+    // 3. 维护已订阅的主题关系：key=完整主题（如wrj:8UUXN4P00A06NK），value=对应的PatternTopic
+    private final Map<String, PatternTopic> subscribedTopics = new ConcurrentHashMap<>();
+
+
+    /**
+     * 项目启动后立即执行一次订阅（避免等待定时任务首次执行）
+     */
+    @PostConstruct
+    public void initSubscribe() {
+        log.info("项目启动，初始化Redis订阅...");
+        // 步骤1：从数据库获取最新的主题列表（原逻辑：getTopicsByKeyPrefix）
+        List<String> latestKeys = droProjectDroneService.getTopicsByKeyPrefix();
+        if (latestKeys == null || latestKeys.isEmpty()) {
+            log.warn("未获取到任何主题，将取消所有现有订阅");
+            cancelAllSubscribes();
+            return;
+        }
+
+        // 步骤2：构建最新的完整主题（格式：wrj:key）
+        Set<String> latestFullTopics = new HashSet<>();
+        for (String key : latestKeys) {
+            latestFullTopics.add("wrj:osd1:" + key);
+            latestFullTopics.add("wrj:osd2:" + key);
+            latestFullTopics.add("wrj:osd3:" + key);
+            latestFullTopics.add("wrj:osd4:" + key);
+        }
+
+
+        // 步骤3：对比现有订阅，删除过期主题
+        cancelExpiredSubscribes(latestFullTopics);
+
+        // 步骤4：对比现有订阅，新增未订阅的主题
+        addNewSubscribes(latestFullTopics);
+    }
+
+    /**
+     * 4. 定时任务：定期更新订阅（每5分钟执行一次，可调整cron表达式）
+     * cron格式：秒 分 时 日 月 周 年（示例：0 0/5 * * * ? 表示每5分钟）
+     */
+    @Scheduled(cron = "0 0/6 * * * ?")
+    public void dynamicUpdateSubscribe() {
+        try {
+            Object object = RedisUtils.getCacheObject("xmjdap:ws");
+            log.info("开始执行Redis订阅更新定时任务...");
+            if (object == null) {
+                cancelAllSubscribes();
+                return;
+            }
+            long oldTime = Long.parseLong(String.valueOf(object));
+            long now = System.currentTimeMillis();
+            if (now-oldTime > 300000) {
+                RedisUtils.deleteObject("xmjdap:ws");
+                cancelAllSubscribes();
+                return;
+            }
+            // 步骤1：从数据库获取最新的主题列表（原逻辑：getTopicsByKeyPrefix）
+            List<String> latestKeys = droProjectDroneService.getTopicsByKeyPrefix();
+            if (latestKeys == null || latestKeys.isEmpty()) {
+                log.warn("定时任务未获取到任何主题，将取消所有现有订阅");
+                cancelAllSubscribes();
+                return;
+            }
+
+            // 步骤2：构建最新的完整主题（格式：wrj:key）
+            Set<String> latestFullTopics = new HashSet<>();
+            for (String key : latestKeys) {
+                latestFullTopics.add("wrj:osd1:" + key);
+                latestFullTopics.add("wrj:osd2:" + key);
+                latestFullTopics.add("wrj:osd3:" + key);
+                latestFullTopics.add("wrj:osd4:" + key);
+            }
+
+            // 步骤3：对比现有订阅，删除过期主题
+            cancelExpiredSubscribes(latestFullTopics);
+
+            // 步骤4：对比现有订阅，新增未订阅的主题
+            addNewSubscribes(latestFullTopics);
+
+            log.info("Redis订阅更新完成，当前已订阅主题数：{}", subscribedTopics.size());
+        } catch (Exception e) {
+            log.error("Redis订阅更新定时任务执行失败", e);
+            // 异常时不修改现有订阅，避免误删
+        }
+    }
+
+    /**
+     * 取消过期的订阅（现有订阅不在最新列表中的主题）
+     */
+    private void cancelExpiredSubscribes(Set<String> latestFullTopics) {
+        // 遍历现有订阅，找出需要删除的主题
+        Set<String> expiredTopics = subscribedTopics.keySet().stream()
+                .filter(topic -> !latestFullTopics.contains(topic))
+                .collect(Collectors.toSet());
+
+        if (expiredTopics.isEmpty()) {
+            log.info("无过期订阅主题，无需删除");
+            return;
+        }
+
+        // 取消每个过期主题的订阅
+        for (String expiredTopic : expiredTopics) {
+            PatternTopic topic = subscribedTopics.get(expiredTopic);
+            if (topic != null) {
+                // 从容器中移除监听器（取消订阅）
+                redisMessageListenerContainer.removeMessageListener(redisMessageListenerAdapter, topic);
+                subscribedTopics.remove(expiredTopic);
+                log.info("已取消过期订阅：{}", expiredTopic);
+            }
+        }
+    }
+
+    /**
+     * 新增未订阅的主题（最新列表中有但现有订阅没有的主题）
+     */
+    private void addNewSubscribes(Set<String> latestFullTopics) {
+        // 遍历最新主题，找出需要新增的主题
+        Set<String> newTopics = latestFullTopics.stream()
+                .filter(topic -> !subscribedTopics.containsKey(topic))
+                .collect(Collectors.toSet());
+
+        if (newTopics.isEmpty()) {
+            log.info("无新增订阅主题，无需添加");
+            return;
+        }
+
+        // 为每个新主题添加订阅
+        for (String newTopic : newTopics) {
+            PatternTopic topic = new PatternTopic(newTopic);
+            // 向容器中添加监听器（新增订阅）
+            redisMessageListenerContainer.addMessageListener(redisMessageListenerAdapter, topic);
+            subscribedTopics.put(newTopic, topic);
+            log.info("已新增订阅：{}", newTopic);
+        }
+    }
+
+    /**
+     * 取消所有现有订阅（兜底方法）
+     */
+    public void cancelAllSubscribes() {
+        if (subscribedTopics.isEmpty()) {
+            return;
+        }
+        // 遍历所有已订阅主题，取消订阅
+        for (Map.Entry<String, PatternTopic> entry : subscribedTopics.entrySet()) {
+            redisMessageListenerContainer.removeMessageListener(redisMessageListenerAdapter, entry.getValue());
+            log.info("已取消订阅：{}", entry.getKey());
+        }
+        subscribedTopics.clear();
+    }
+
+
+
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/mapper/ProjectBigScreenMapper.java

@@ -0,0 +1,59 @@
+package org.dromara.bigscreen.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.dromara.bigscreen.domain.*;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @author lilemy
+ * @date 2025-09-10 19:32
+ */
+@DS("slave2")
+@Mapper
+public interface ProjectBigScreenMapper {
+
+//    @Select("select * from bus_corporate_events limit 10")
+//    List<BusCorporateEvents> getBusCorporateEvents();
+//
+//    @Select("select * from sys_project_introduce where project_id = #{projectId}")
+//    List<SysProjectIntroduce> selectByProjectId(@Param("projectId") Long projectId);
+//
+//    @Select("select count(*) from bus_construction_user where project_id = #{projectId} && deleted_at is NULL")
+//    Integer getProjectUserCount(@Param("projectId") Long projectId);
+//
+//    @Select("select count(*) from bus_construction_user where project_id in (60,59) && deleted_at is NULL")
+//    Integer getUserCount();
+//
+//    @Select("select count(*) from bus_attendance where project_id = #{projectId} && printing_date = #{printingDate} && commuter = '1'")
+//    Integer getAttendanceCount(@Param("projectId") Long projectId,
+//                               @Param("printingDate") String printingDate);
+//
+//    @Select("SELECT * FROM sys_project_team WHERE project_id = #{projectId} && deleted_at is NULL")
+//    List<BusProjectTeamByGo> getTeamList(@Param("projectId") Long projectId);
+//
+//    @Select("SELECT * FROM bus_construction_user WHERE project_id = #{projectId} && deleted_at is NULL")
+//    List<BusConstructionUser> getProjectUserList(@Param("projectId") Long projectId);
+//
+//    @Select({
+//        "<script>",
+//        "SELECT count(*) ",
+//        "FROM bus_attendance ",
+//        "WHERE openid IN ",
+//        "<foreach collection='openIds' item='id' open='(' separator=',' close=')'>",
+//        "   #{id}",
+//        "</foreach>",
+//        "AND printing_date = #{printingDate} ",
+//        "AND commuter = '1'",
+//        "</script>"
+//    })
+//    Integer getAttendanceCountByOpenIds(@Param("openIds") List<String> openIds,
+//                                        @Param("printingDate") LocalDate printingDate);
+//
+//    @Select("SELECT * FROM bus_tour WHERE project_id = #{projectId} AND deleted_at IS NULL LIMIT 10")
+//    List<BusTour> selectTourByProjectId(@Param("projectId") Long projectId);
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/EnterpriseBigScreenService.java

@@ -0,0 +1,57 @@
+package org.dromara.bigscreen.service;
+
+import org.dromara.bigscreen.domain.dto.WeatherQueryReq;
+import org.dromara.bigscreen.domain.vo.*;
+import org.dromara.manager.weathermanager.vo.WeatherVo;
+
+import java.util.List;
+
+/**
+ * @author lilemy
+ * @date 2025-09-09 15:31
+ */
+public interface EnterpriseBigScreenService {
+
+    /**
+     * 获取关键指标
+     *
+     * @return 关键指标
+     */
+    EnterpriseKeyIndexVo getEnterpriseKeyIndex();
+
+    /**
+     * 获取项目进度分析
+     *
+     * @return 项目进度分析
+     */
+    ProjectProgressAnalysisVo getProjectProgressAnalysis();
+
+    /**
+     * 获取项目产值对比
+     *
+     * @return 项目产值对比
+     */
+    List<OutputValueComparisonVo> getProjectOutputValueComparison();
+
+    /**
+     * 获取风险预警
+     *
+     * @return 风险预警
+     */
+    List<RiskEarlyWarningVo> getRiskEarlyWarning();
+
+    /**
+     * 获取当前登录用户3天的天气列表
+     *
+     * @param req 查询参数
+     * @return 天气列表
+     */
+    List<WeatherVo> getWeather3DaysList(WeatherQueryReq req);
+
+    /**
+     * 获取项目进度占比
+     *
+     * @return 项目进度占比
+     */
+    List<ProjectProgressCapacityVo> getProjectProgressCapacity();
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/MoneyBigScreenService.java

@@ -1,8 +1,8 @@
 package org.dromara.bigscreen.service;
 
+import org.dromara.manager.weathermanager.vo.WeatherVo;
 import org.dromara.project.domain.vo.project.BusProjectGisVo;
 import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo;
-import org.dromara.project.domain.vo.project.BusProjectWeatherVo;
 
 import java.util.List;
 
@@ -25,7 +25,7 @@ public interface MoneyBigScreenService {
      * @param projectId 项目id
      * @return 项目天气
      */
-    List<BusProjectWeatherVo> getProjectWeather(Long projectId);
+    List<WeatherVo> getProjectWeather(Long projectId);
 
     /**
      * 获取项目安全天数

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java

@@ -1,13 +1,16 @@
 package org.dromara.bigscreen.service;
 
+import org.dromara.bigscreen.domain.dto.TanchuangInfoReq;
 import org.dromara.bigscreen.domain.vo.ProjectImageProgressVo;
 import org.dromara.bigscreen.domain.vo.ProjectPeopleVo;
 import org.dromara.bigscreen.domain.vo.ProjectSafetyInspectionVo;
+import org.dromara.gps.domain.bo.GpsEquipmentBo;
+import org.dromara.manager.weathermanager.vo.WeatherVo;
 import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo;
-import org.dromara.project.domain.vo.project.BusProjectWeatherVo;
 import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author lilemy
@@ -21,7 +24,7 @@ public interface ProjectBigScreenService {
      * @param projectId 项目id
      * @return 项目天气
      */
-    List<BusProjectWeatherVo> getProjectWeather(Long projectId);
+    List<WeatherVo> getProjectWeather(Long projectId);
 
     /**
      * 获取项目安全天数
@@ -61,7 +64,7 @@ public interface ProjectBigScreenService {
      * @param projectId 项目id
      * @return 项目形象进度
      */
-    ProjectImageProgressVo getProjectImageProgress(Long projectId);
+    List<ProjectImageProgressVo> getProjectImageProgress(Long projectId);
 
     /**
      * 获取项目概括
@@ -70,4 +73,17 @@ public interface ProjectBigScreenService {
      * @return 项目概括
      */
     String getProjectGeneralize(Long projectId);
+
+    List<String> getList(Long projectId);
+
+    void setList(GpsEquipmentBo bo);
+
+    List<Map<String, Object>> getClientList(Long projectId);
+
+    /**
+     * 更新无人机缓存
+     */
+    void setWrjHc();
+
+    Map<String, Map<String, Object>> getInfoData(TanchuangInfoReq req);
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/EnterpriseBigScreenServiceImpl.java

@@ -0,0 +1,429 @@
+package org.dromara.bigscreen.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import jakarta.annotation.Resource;
+import org.dromara.bigscreen.domain.dto.WeatherQueryReq;
+import org.dromara.bigscreen.domain.vo.*;
+import org.dromara.bigscreen.service.EnterpriseBigScreenService;
+import org.dromara.common.core.enums.BusinessStatusEnum;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.utils.BigDecimalUtil;
+import org.dromara.manager.weathermanager.WeatherConstant;
+import org.dromara.manager.weathermanager.WeatherManager;
+import org.dromara.manager.weathermanager.vo.WeatherVo;
+import org.dromara.out.domain.BusProcurement;
+import org.dromara.out.domain.OutConstructionValueRange;
+import org.dromara.out.domain.OutMonthPlanAudit;
+import org.dromara.out.domain.OutValueAllocation;
+import org.dromara.out.service.*;
+import org.dromara.progress.domain.PgsProgressCategory;
+import org.dromara.progress.service.IPgsProgressCategoryService;
+import org.dromara.project.domain.BusProject;
+import org.dromara.project.service.IBusProjectService;
+import org.dromara.safety.domain.HseRecognizeRecord;
+import org.dromara.safety.domain.HseViolationLevel;
+import org.dromara.safety.domain.HseViolationRecord;
+import org.dromara.safety.service.IHseRecognizeRecordService;
+import org.dromara.safety.service.IHseViolationLevelService;
+import org.dromara.safety.service.IHseViolationRecordService;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author lilemy
+ * @date 2025-09-09 15:32
+ */
+@Service
+public class EnterpriseBigScreenServiceImpl implements EnterpriseBigScreenService {
+
+    @Resource
+    private WeatherManager weatherManager;
+
+    @Resource
+    private IBusProjectService projectService;
+
+    @Resource
+    private IPgsProgressCategoryService progressCategoryService;
+
+    @Resource
+    private IOutValueAllocationService outValueAllocationService;
+
+    @Resource
+    private IOutMonthPlanAuditService outMonthPlanAuditService;
+
+    @Resource
+    private IOutConstructionValueService outConstructionValueService;
+
+    @Resource
+    private IOutConstructionValueRangeService outConstructionValueRangeService;
+
+    @Resource
+    private IHseViolationRecordService hseViolationRecordService;
+
+    @Resource
+    private IHseViolationLevelService hseViolationLevelService;
+
+    @Resource
+    private IBusProcurementService busProcurementService;
+
+    @Resource
+    private IHseRecognizeRecordService hseRecognizeRecordService;
+
+    /**
+     * 获取关键指标
+     *
+     * @return 关键指标
+     */
+    @Override
+    public EnterpriseKeyIndexVo getEnterpriseKeyIndex() {
+        EnterpriseKeyIndexVo vo = new EnterpriseKeyIndexVo();
+        // 在建项目
+        List<BusProject> projectList = projectService.lambdaQuery()
+            .eq(BusProject::getStatus, 0)
+            .eq(BusProject::getPId, 0)
+            .list();
+        // 光伏项目
+        int photovoltaicCount = projectList.stream()
+            .filter(s -> s.getProjectType().equals("1"))
+            .toList()
+            .size();
+        BigDecimal photovoltaicTotalCapacity = projectList.stream()
+            .filter(s -> s.getProjectType().equals("1"))
+            .map(BusProject::getPlan)
+            .filter(s -> s != null && !s.isBlank()) // 过滤掉空值
+            .map(BigDecimal::new) // 转成 BigDecimal
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
+        // 风电项目
+        int windElectricityCount = projectList.stream()
+            .filter(s -> s.getProjectType().equals("2"))
+            .toList()
+            .size();
+        BigDecimal windElectricityTotalCapacity = projectList.stream()
+            .filter(s -> s.getProjectType().equals("2"))
+            .map(BusProject::getPlan)
+            .filter(s -> s != null && !s.isBlank()) // 过滤掉空值
+            .map(BigDecimal::new) // 转成 BigDecimal
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
+        vo.setPhotovoltaicCount(photovoltaicCount);
+        vo.setWindElectricityCount(windElectricityCount);
+        vo.setPhotovoltaicTotalCapacity(photovoltaicTotalCapacity);
+        vo.setWindElectricityTotalCapacity(windElectricityTotalCapacity);
+        vo.setPerformanceCount(52L);
+        vo.setTypicalPerformance(22L);
+        return vo;
+    }
+
+    /**
+     * 获取项目进度分析
+     *
+     * @return 项目进度分析
+     */
+    @Override
+    public ProjectProgressAnalysisVo getProjectProgressAnalysis() {
+        ProjectProgressAnalysisVo vo = new ProjectProgressAnalysisVo();
+        // 1. 查询顶级项目
+        List<BusProject> projectList = projectService.lambdaQuery()
+            .select(BusProject::getId, BusProject::getProjectName, BusProject::getActual, BusProject::getPlan)
+            .eq(BusProject::getStatus, 0)
+            .eq(BusProject::getPId, 0)
+            .list();
+        if (CollUtil.isEmpty(projectList)) {
+            return vo;
+        }
+        // 2. 拿到顶级项目 id
+        List<Long> projectIds = projectList.stream()
+            .map(BusProject::getId)
+            .distinct()
+            .toList();
+        // 3. 查询子项目（pId 在顶级项目id里）
+        List<BusProject> subProject = projectService.lambdaQuery()
+            .select(BusProject::getId, BusProject::getPId)
+            .in(BusProject::getPId, projectIds)
+            .list();
+        // 4. 按父项目id分组子项目
+        Map<Long, List<BusProject>> subProjectMap = subProject.stream()
+            .collect(Collectors.groupingBy(BusProject::getPId));
+        // 5. 查询所有子项目的进度分类
+        List<PgsProgressCategory> progressCategoryList = progressCategoryService.lambdaQuery()
+            .select(PgsProgressCategory::getId,
+                PgsProgressCategory::getProjectId,
+                PgsProgressCategory::getCompleted,
+                PgsProgressCategory::getTotal)
+            .in(CollUtil.isNotEmpty(subProject),
+                PgsProgressCategory::getProjectId,
+                subProject.stream().map(BusProject::getId).toList())
+            .list();
+        // 6. 按子项目id分组进度分类
+        Map<Long, List<PgsProgressCategory>> progressCategoryMap = progressCategoryList.stream()
+            .collect(Collectors.groupingBy(PgsProgressCategory::getProjectId));
+        // 并网容量 =（完工产值/计划总产值）* 计划容量
+        List<OutputValueComparisonVo> list = getProjectOutputValueComparison();
+        BigDecimal actualValue = list.stream()
+            .map(OutputValueComparisonVo::getActualValue)
+            .filter(Objects::nonNull)
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal planValue = list.stream()
+            .map(OutputValueComparisonVo::getPlanValue)
+            .filter(Objects::nonNull)
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal plannedCapacity = projectList.stream().map(BusProject::getPlan)
+            .filter(s -> s != null && !s.isBlank()) // 过滤掉空值
+            .map(BigDecimal::new) // 转成 BigDecimal
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal gridConnectedCapacity = BigDecimal.ZERO;
+        if (planValue.compareTo(BigDecimal.ZERO) != 0) {
+            gridConnectedCapacity = plannedCapacity.multiply(actualValue.divide(planValue, 2, RoundingMode.HALF_UP));
+        }
+        vo.setGridConnectedCapacity(gridConnectedCapacity);
+        List<ProjectProgressDetailVo> detailVoList = projectList.stream().map(project -> {
+            ProjectProgressDetailVo detailVo = new ProjectProgressDetailVo();
+            detailVo.setProjectName(project.getProjectName());
+            detailVo.setProjectCapacity(new BigDecimal(project.getActual()));
+            List<BusProject> children = subProjectMap.getOrDefault(project.getId(), List.of());
+            List<PgsProgressCategory> categoryList = new ArrayList<>();
+            for (BusProject child : children) {
+                categoryList.addAll(progressCategoryMap.getOrDefault(child.getId(), List.of()));
+            }
+            if (CollUtil.isNotEmpty(categoryList)) {
+                BigDecimal completed = categoryList.stream().map(PgsProgressCategory::getCompleted)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                BigDecimal total = categoryList.stream().map(PgsProgressCategory::getTotal)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                detailVo.setCompletionRate(BigDecimalUtil.toPercentage(completed, total));
+            }
+            return detailVo;
+        }).toList();
+        vo.setGridConnectedCapacity(gridConnectedCapacity);
+        vo.setPlannedCapacity(plannedCapacity);
+        // todo 获取延迟项目数
+        vo.setDelayedProjectCount(0);
+        vo.setProjectProgressDetailList(detailVoList);
+        return vo;
+    }
+
+    /**
+     * 获取项目产值对比
+     *
+     * @return 项目产值对比
+     */
+    @Override
+    public List<OutputValueComparisonVo> getProjectOutputValueComparison() {
+        // 查询顶级项目
+        List<BusProject> projectList = projectService.lambdaQuery()
+            .select(BusProject::getId, BusProject::getProjectName, BusProject::getActual, BusProject::getPlan)
+            .eq(BusProject::getStatus, 0)
+            .eq(BusProject::getPId, 0)
+            .list();
+        // 计划产值
+        List<OutValueAllocation> planList = outValueAllocationService.lambdaQuery()
+            .select(OutValueAllocation::getProjectId, OutValueAllocation::getOwnerTotalValue)
+            .list();
+        Map<Long, BigDecimal> planMap = planList.stream()
+            .collect(Collectors.toMap(OutValueAllocation::getProjectId, OutValueAllocation::getOwnerTotalValue));
+        // 实际产值
+        // 施工产值
+        List<OutConstructionValueRange> constructionValueRangeList = outConstructionValueRangeService.lambdaQuery()
+            .select(OutConstructionValueRange::getProjectId, OutConstructionValueRange::getOwnerValue)
+            .eq(OutConstructionValueRange::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())
+            .list();
+        // 采购产值
+        List<BusProcurement> purchaseValueList = busProcurementService.lambdaQuery()
+            .select(BusProcurement::getProjectId, BusProcurement::getAcceptedQuantity, BusProcurement::getUnitPrice)
+            .list();
+        // 设计产值
+        List<OutMonthPlanAudit> designValueList = outMonthPlanAuditService.lambdaQuery()
+            .select(OutMonthPlanAudit::getProjectId, OutMonthPlanAudit::getDesignValue)
+            .eq(OutMonthPlanAudit::getType, "1")
+            .list();
+        // 封装数据
+        return projectList.stream().map(project -> {
+                OutputValueComparisonVo vo = new OutputValueComparisonVo();
+                vo.setProjectId(project.getId());
+                vo.setProjectName(project.getProjectName());
+                vo.setPlanValue(planMap.getOrDefault(project.getId(), BigDecimal.ZERO));
+                BigDecimal actualValue = BigDecimal.ZERO;
+                // 设计产值
+                List<OutMonthPlanAudit> designValue = designValueList.stream()
+                    .filter(design -> design.getProjectId().equals(project.getId()))
+                    .toList();
+                if (CollUtil.isNotEmpty(designValue)) {
+                    BigDecimal dValue = designValue.stream()
+                        .filter(Objects::nonNull)
+                        .map(OutMonthPlanAudit::getDesignValue)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    actualValue = actualValue.add(dValue);
+                }
+                // 施工产值
+                List<OutConstructionValueRange> constructionValue = constructionValueRangeList.stream()
+                    .filter(construction -> construction.getProjectId().equals(project.getId()))
+                    .toList();
+                if (CollUtil.isNotEmpty(constructionValue)) {
+                    BigDecimal cValue = constructionValue.stream()
+                        .filter(Objects::nonNull)
+                        .map(OutConstructionValueRange::getOwnerValue)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    actualValue = actualValue.add(cValue);
+                }
+                // 采购产值
+                List<BusProcurement> purchaseValue = purchaseValueList.stream()
+                    .filter(purchase -> purchase.getProjectId().equals(project.getId()))
+                    .toList();
+                if (CollUtil.isNotEmpty(purchaseValue)) {
+                    BigDecimal pValue = purchaseValue.stream()
+                        .filter(Objects::nonNull)
+                        .filter(purchase -> purchase.getAcceptedQuantity() != null && purchase.getUnitPrice() != null)
+                        .map(purchase -> purchase.getAcceptedQuantity().multiply(purchase.getUnitPrice()))
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    actualValue = actualValue.add(pValue);
+                }
+                vo.setActualValue(actualValue);
+                return vo;
+            }).filter(vo -> vo.getActualValue().compareTo(BigDecimal.ZERO) > 0)
+            .toList();
+    }
+
+    /**
+     * 获取风险预警
+     *
+     * @return 风险预警
+     */
+    @Override
+    public List<RiskEarlyWarningVo> getRiskEarlyWarning() {
+        List<HseViolationRecord> recordList = hseViolationRecordService.lambdaQuery()
+            .last("limit 10")
+            .list();
+        recordList = recordList.stream()
+            .filter(record -> record.getReviewType() == null || record.getReviewType().equals("2"))
+            .toList();
+        if (CollUtil.isEmpty(recordList)) {
+            return Collections.emptyList();
+        }
+        // 项目映射
+        Set<Long> projectIds = recordList.stream()
+            .map(HseViolationRecord::getProjectId)
+            .collect(Collectors.toSet());
+        List<BusProject> projectList = projectService.lambdaQuery()
+            .select(BusProject::getId, BusProject::getProjectName)
+            .in(BusProject::getId, projectIds)
+            .list();
+        Map<Long, String> projectMap = projectList.stream()
+            .collect(Collectors.toMap(BusProject::getId, BusProject::getProjectName));
+        // 风险映射
+        Set<Long> levelIds = recordList.stream()
+            .map(HseViolationRecord::getLevelId)
+            .collect(Collectors.toSet());
+        List<HseViolationLevel> levelList = hseViolationLevelService.lambdaQuery()
+            .select(HseViolationLevel::getId, HseViolationLevel::getRiskType, HseViolationLevel::getViolationLevel)
+            .in(HseViolationLevel::getId, levelIds)
+            .list();
+        Map<Long, HseViolationLevel> levelMap = levelList.stream()
+            .collect(Collectors.toMap(HseViolationLevel::getId, level -> level));
+        // 识别记录映射
+        Set<Long> recognizeIds = recordList.stream()
+            .map(HseViolationRecord::getRecognizeId)
+            .collect(Collectors.toSet());
+        List<HseRecognizeRecord> recognizeRecordList = hseRecognizeRecordService.lambdaQuery()
+            .in(HseRecognizeRecord::getId, recognizeIds)
+            .list();
+        Map<Long, HseRecognizeRecord> recognizeRecordMap = recognizeRecordList.stream()
+            .collect(Collectors.toMap(HseRecognizeRecord::getId, recognize -> recognize));
+        return recordList.stream().map(record -> {
+            RiskEarlyWarningVo vo = new RiskEarlyWarningVo();
+            Date violationTime = record.getViolationTime() != null ? record.getViolationTime() : record.getCreateTime();
+            vo.setDate(DateUtils.toLocalDate(violationTime));
+            vo.setSource(projectMap.getOrDefault(record.getProjectId(), "未知项目"));
+            vo.setRiskType(record.getViolationType());
+            if (levelMap.containsKey(record.getLevelId())) {
+                HseViolationLevel level = levelMap.get(record.getLevelId());
+                vo.setAlarmLevel(level.getRiskType());
+                vo.setDangerLevel(level.getViolationLevel());
+            }
+            if (recognizeRecordMap.containsKey(record.getRecognizeId())) {
+                HseRecognizeRecord hseRecognizeRecord = recognizeRecordMap.get(record.getRecognizeId());
+                vo.setAlarmContent(hseRecognizeRecord.getDescription());
+            }
+            return vo;
+        }).toList();
+    }
+
+    /**
+     * 获取当前登录用户3天的天气列表
+     *
+     * @return 天气列表
+     */
+    @Override
+    public List<WeatherVo> getWeather3DaysList(WeatherQueryReq req) {
+        return weatherManager.getWeatherListVo(req.getLng(), req.getLat(), WeatherConstant.THREE_DAYS_WEATHER_PATH);
+    }
+
+    /**
+     * 获取项目进度占比
+     *
+     * @return 项目进度占比
+     */
+    @Override
+    public List<ProjectProgressCapacityVo> getProjectProgressCapacity() {
+        // 1. 查询顶级项目
+        List<BusProject> projectList = projectService.lambdaQuery()
+            .select(BusProject::getId, BusProject::getProjectName, BusProject::getActual, BusProject::getPlan)
+            .eq(BusProject::getStatus, 0)
+            .eq(BusProject::getPId, 0)
+            .list();
+        if (CollUtil.isEmpty(projectList)) {
+            return List.of();
+        }
+        // 2. 拿到顶级项目 id
+        List<Long> projectIds = projectList.stream()
+            .map(BusProject::getId)
+            .distinct()
+            .toList();
+        // 3. 查询子项目（pId 在顶级项目id里）
+        List<BusProject> subProject = projectService.lambdaQuery()
+            .select(BusProject::getId, BusProject::getPId)
+            .in(BusProject::getPId, projectIds)
+            .list();
+        // 4. 按父项目id分组子项目
+        Map<Long, List<BusProject>> subProjectMap = subProject.stream()
+            .collect(Collectors.groupingBy(BusProject::getPId));
+        // 5. 查询所有子项目的进度分类
+        List<PgsProgressCategory> progressCategoryList = progressCategoryService.lambdaQuery()
+            .select(PgsProgressCategory::getId,
+                PgsProgressCategory::getProjectId,
+                PgsProgressCategory::getCompleted,
+                PgsProgressCategory::getTotal)
+            .in(CollUtil.isNotEmpty(subProject),
+                PgsProgressCategory::getProjectId,
+                subProject.stream().map(BusProject::getId).toList())
+            .list();
+        // 6. 按子项目id分组进度分类
+        Map<Long, List<PgsProgressCategory>> progressCategoryMap = progressCategoryList.stream()
+            .collect(Collectors.groupingBy(PgsProgressCategory::getProjectId));
+        return projectList.stream().map(project -> {
+            ProjectProgressCapacityVo detailVo = new ProjectProgressCapacityVo();
+            detailVo.setProjectId(project.getId());
+            detailVo.setProjectName(project.getProjectName());
+            detailVo.setPlannedCapacity(new BigDecimal(project.getPlan()));
+            List<BusProject> children = subProjectMap.getOrDefault(project.getId(), List.of());
+            List<PgsProgressCategory> categoryList = new ArrayList<>();
+            for (BusProject child : children) {
+                categoryList.addAll(progressCategoryMap.getOrDefault(child.getId(), List.of()));
+            }
+            if (CollUtil.isNotEmpty(categoryList)) {
+                BigDecimal completed = categoryList.stream().map(PgsProgressCategory::getCompleted)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                BigDecimal total = categoryList.stream().map(PgsProgressCategory::getTotal)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+                detailVo.setProgressPercentage(BigDecimalUtil.toPercentage(completed, total));
+            }
+            return detailVo;
+        }).toList();
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MoneyBigScreenServiceImpl.java

@@ -4,10 +4,10 @@ import jakarta.annotation.Resource;
 import org.dromara.bigscreen.service.MoneyBigScreenService;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
+import org.dromara.manager.weathermanager.vo.WeatherVo;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.vo.project.BusProjectGisVo;
 import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo;
-import org.dromara.project.domain.vo.project.BusProjectWeatherVo;
 import org.dromara.project.service.IBusProjectService;
 import org.springframework.stereotype.Service;
 
@@ -40,7 +40,7 @@ public class MoneyBigScreenServiceImpl implements MoneyBigScreenService {
      * @return 项目天气
      */
     @Override
-    public List<BusProjectWeatherVo> getProjectWeather(Long projectId) {
+    public List<WeatherVo> getProjectWeather(Long projectId) {
         checkProject(projectId);
         return projectService.getWeather(projectId);
     }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java

@@ -1,9 +1,11 @@
 package org.dromara.bigscreen.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.NumberUtil;
+import cn.hutool.json.JSONArray;
-import cn.hutool.core.util.RandomUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import jakarta.annotation.Resource;
+import org.dromara.bigscreen.domain.dto.TanchuangInfoReq;
 import org.dromara.bigscreen.domain.vo.ProjectImageProgressVo;
 import org.dromara.bigscreen.domain.vo.ProjectPeopleVo;
 import org.dromara.bigscreen.domain.vo.ProjectSafetyInspectionVo;
@@ -11,27 +13,41 @@ import org.dromara.bigscreen.domain.vo.ProjectTeamAttendanceVo;
 import org.dromara.bigscreen.service.ProjectBigScreenService;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.utils.BigDecimalUtil;
 import org.dromara.contractor.domain.SubConstructionUser;
 import org.dromara.contractor.service.ISubConstructionUserService;
+import org.dromara.drone.service.IDroProjectDroneService;
+import org.dromara.gps.domain.bo.GpsEquipmentBo;
+import org.dromara.gps.domain.vo.DeviceVo;
+import org.dromara.gps.domain.vo.GpsEquipmentSonVo;
+import org.dromara.gps.domain.vo.LocationVo;
+import org.dromara.gps.service.IDeviceService;
+import org.dromara.gps.service.IGpsEquipmentService;
+import org.dromara.manager.weathermanager.vo.WeatherVo;
+import org.dromara.other.domain.OthYs7Device;
+import org.dromara.other.service.IOthYs7DeviceService;
+import org.dromara.progress.constant.PgsProgressCategoryConstant;
+import org.dromara.progress.domain.PgsProgressCategory;
+import org.dromara.progress.service.IPgsProgressCategoryService;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.BusProjectTeam;
 import org.dromara.project.domain.BusProjectTeamMember;
 import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo;
-import org.dromara.project.domain.vo.project.BusProjectWeatherVo;
 import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo;
 import org.dromara.project.service.*;
 import org.dromara.safety.domain.HseRecognizeRecord;
 import org.dromara.safety.service.IHseRecognizeRecordService;
 import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.ArrayList;
+import java.time.LocalDateTime;
-import java.util.HashMap;
+import java.time.LocalTime;
-import java.util.List;
+import java.util.*;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -62,6 +78,23 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
     @Resource
     private IBusProjectTeamMemberService projectTeamMemberService;
 
+    @Resource
+    private IPgsProgressCategoryService progressCategoryService;
+
+    @Resource
+    private IDroProjectDroneService droProjectDroneService;
+    @Resource
+    private IGpsEquipmentService gpsEquipmentService;
+    @Resource
+    private IOthYs7DeviceService othYs7DeviceService;
+
+    @Resource
+    @Lazy
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Resource
+    private IDeviceService deviceService;
+
     /**
      * 获取项目天气
      *
@@ -69,7 +102,7 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
      * @return 项目天气
      */
     @Override
-    public List<BusProjectWeatherVo> getProjectWeather(Long projectId) {
+    public List<WeatherVo> getProjectWeather(Long projectId) {
         checkProject(projectId);
         return projectService.getWeather(projectId);
     }
@@ -135,8 +168,12 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
         // 获取大屏数据
         ProjectPeopleVo vo = new ProjectPeopleVo();
         // 获取施工人员总数
-        Long count = constructionUserService.lambdaQuery()
+        List<SubConstructionUser> list = constructionUserService.lambdaQuery()
-            .eq(SubConstructionUser::getProjectId, projectId).count();
+            .eq(SubConstructionUser::getProjectId, projectId)
+            .eq(SubConstructionUser::getUserRole, "0")
+            .isNotNull(SubConstructionUser::getTeamId).list();
+        List<Long> sysUserIdList = list.stream().map(SubConstructionUser::getSysUserId).toList();
+        int count = list.size();
         BigDecimal countDec = BigDecimal.valueOf(count);
         vo.setPeopleCount(countDec);
         // 获取考勤数据
@@ -150,13 +187,17 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
             List<BusProjectTeamMember> memberList = projectTeamMemberService.lambdaQuery()
                 .select(BusProjectTeamMember::getId, BusProjectTeamMember::getTeamId)
                 .eq(BusProjectTeamMember::getProjectId, projectId)
+                .in(BusProjectTeamMember::getMemberId, sysUserIdList)
                 .list();
             Map<Long, List<BusProjectTeamMember>> memberMap = memberList.stream()
                 .collect(Collectors.groupingBy(BusProjectTeamMember::getTeamId));
             // 统计班组考勤数据
             Map<Long, List<SubConstructionUser>> userTeamMap = new HashMap<>();
             if (CollUtil.isNotEmpty(attendancePeopleList)) {
-                List<SubConstructionUser> users = constructionUserService.listByIds(attendancePeopleList);
+                List<SubConstructionUser> users = constructionUserService.lambdaQuery()
+                    .in(SubConstructionUser::getSysUserId, attendancePeopleList)
+                    .isNotNull(SubConstructionUser::getTeamId)
+                    .list();
                 userTeamMap = users.stream()
                     .collect(Collectors.groupingBy(SubConstructionUser::getTeamId));
             }
@@ -167,7 +208,7 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
             String punchTime = "";
             if (punchRange != null) {
                 String start = punchRange.split(",")[0];
-                punchTime = LocalDate.now() + " " + start;
+                punchTime = LocalDate.now() + " ";
             }
             List<ProjectTeamAttendanceVo> listVo = new ArrayList<>();
             for (BusProjectTeam projectTeam : teamList) {
@@ -201,54 +242,185 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
      * @return 项目形象进度
      */
     @Override
-    public ProjectImageProgressVo getProjectImageProgress(Long projectId) {
+    public List<ProjectImageProgressVo> getProjectImageProgress(Long projectId) {
         checkProject(projectId);
-        // 生成 0 ~ 100 的随机 double
+        // 获取当前项目的所有子项目
-        double random = RandomUtil.randomDouble(0, 100);
+        List<Long> projectIds = new ArrayList<>(projectService.lambdaQuery()
-
+            .select(BusProject::getId)
-        // 保留两位小数（四舍五入）
+            .eq(BusProject::getPId, projectId)
-        double result = NumberUtil.round(random, 2).doubleValue();
+            .list()
-        ProjectImageProgressVo vo = new ProjectImageProgressVo();
+            .stream()
-        vo.setAreaPercentage(BigDecimal.valueOf(result));
+            .map(BusProject::getId)
-        // 生成 0 ~ 100 的随机 double
+            .toList());
-        double random1 = RandomUtil.randomDouble(0, 100);
+        projectIds.add(projectId);
-
+        // 查询该子项目下的顶级进度类别（父ID为0）
-        // 保留两位小数（四舍五入）
+        List<PgsProgressCategory> list = progressCategoryService.lambdaQuery()
-        double result1 = NumberUtil.round(random1, 2).doubleValue();
+            .in(PgsProgressCategory::getProjectId, projectIds)
-        vo.setRoadPercentage(BigDecimal.valueOf(result1));
+            .eq(PgsProgressCategory::getParentId, PgsProgressCategoryConstant.TOP_PARENT_ID)
-        // 生成 0 ~ 100 的随机 double
+            .list();
-        double random2 = RandomUtil.randomDouble(0, 100);
+        // 如果没有查询到顶级进度类别，直接返回空集合
-
+        if (CollUtil.isEmpty(list)) {
-        // 保留两位小数（四舍五入）
+            return List.of();
-        double result2 = NumberUtil.round(random2, 2).doubleValue();
+        }
-        vo.setCollectorLinePercentage(BigDecimal.valueOf(result2));
+        List<ProjectImageProgressVo> topList = new ArrayList<>();
-        // 生成 0 ~ 100 的随机 double
+        // 获取这些顶级类别的所有子节点
-        double random3 = RandomUtil.randomDouble(0, 100);
+        List<Long> ids = list.stream().map(PgsProgressCategory::getId).distinct().toList();
-
+        List<PgsProgressCategory> childrenNodes = progressCategoryService.getChildrenNodeByTopIds(ids);
-        // 保留两位小数（四舍五入）
+        if (CollUtil.isNotEmpty(list)) {
-        double result3 = NumberUtil.round(random3, 2).doubleValue();
+            // 按名称分组（同名的放在一起）
-        vo.setExportLinePercentage(BigDecimal.valueOf(result3));
+            Map<String, List<PgsProgressCategory>> subMap = list.stream()
-        // 生成 0 ~ 100 的随机 double
+                .collect(Collectors.groupingBy(PgsProgressCategory::getName));
-        double random4 = RandomUtil.randomDouble(0, 100);
+            for (Map.Entry<String, List<PgsProgressCategory>> entry : subMap.entrySet()) {
-
+                ProjectImageProgressVo topVo = new ProjectImageProgressVo();
-        // 保留两位小数（四舍五入）
+                topVo.setProgressName(entry.getKey());
-        double result4 = NumberUtil.round(random4, 2).doubleValue();
+                List<PgsProgressCategory> value = entry.getValue();
-        vo.setSubstationPercentage(BigDecimal.valueOf(result4));
+                // 获取这些类别下的所有叶子节点
-        // 生成 0 ~ 100 的随机 double
+                List<Long> topIds = value.stream().map(PgsProgressCategory::getId).distinct().toList();
-        double random5 = RandomUtil.randomDouble(0, 100);
+                List<PgsProgressCategory> leafNodesByTopIds = childrenNodes.stream()
-
+                    .filter(node -> {
-        // 保留两位小数（四舍五入）
+                        Set<Long> ancestorSet = Arrays.stream(node.getAncestors().split(","))
-        double result5 = NumberUtil.round(random5, 2).doubleValue();
+                            .map(Long::parseLong)
-        vo.setBoxTransformerPercentage(BigDecimal.valueOf(result5));
+                            .collect(Collectors.toSet());
-
+                        return topIds.stream().anyMatch(ancestorSet::contains);
-        // 生成 0 ~ 100 的随机 double
+                    }).toList();
-        double random6 = RandomUtil.randomDouble(0, 100);
+                // 如果有叶子节点，统计进度和状态；否则初始化为未完成
-
+                if (CollUtil.isNotEmpty(leafNodesByTopIds)) {
-        // 保留两位小数（四舍五入）
+                    topVo.setProgressTotal(progressCategoryService.getCompletedPercentage(leafNodesByTopIds));
-        double result6 = NumberUtil.round(random6, 2).doubleValue();
+                } else {
-        vo.setTotalPercentage(BigDecimal.valueOf(result6));
+                    topVo.setProgressTotal(BigDecimal.ZERO);
+                }
+                // 加入结果集
+                topList.add(topVo);
+            }
+        }
+        return topList;
+/*        ProjectImageProgressVo vo = new ProjectImageProgressVo();
+        // 获取所有子项目列表
+        List<BusProject> subProjectList = projectService.lambdaQuery()
+            .eq(BusProject::getPId, projectId)
+            .list();
+        if (CollUtil.isEmpty(subProjectList)) {
             return vo;
         }
+        // 子项目id列表
+        List<Long> projectIds = new ArrayList<>(subProjectList.stream().map(BusProject::getId).toList());
+        // 计算集电线路
+        vo.setCollectorLinePercentage(BigDecimal.valueOf(0.00));
+        // 计算送出线路
+        vo.setExportLinePercentage(BigDecimal.valueOf(0.00));
+        // 计算升压站
+        vo.setSubstationPercentage(BigDecimal.valueOf(0.00));
+        // 计算光伏场区
+        vo.setAreaPercentage(BigDecimal.valueOf(0.00));
+        // 计算道路
+        vo.setRoadPercentage(BigDecimal.valueOf(0.00));
+        // 计算箱变
+        vo.setBoxTransformerPercentage(BigDecimal.ZERO);
+        // 获取集电线路、送出线路、升压站数据
+        projectIds.add(projectId);
+        List<PgsProgressCategory> progressCategoryList = progressCategoryService.lambdaQuery()
+            .in(PgsProgressCategory::getProjectId, projectIds)
+            .in(PgsProgressCategory::getName, "集电线路", "送出线路", "升压站", "光伏场区")
+            .eq(PgsProgressCategory::getParentId, 0L)
+            .list();
+        if (CollUtil.isNotEmpty(progressCategoryList)) {
+            List<Long> categoryIds = progressCategoryList.stream().map(PgsProgressCategory::getId).distinct().toList();
+            List<PgsProgressCategory> leafNodesByTopIds = progressCategoryService.getLeafNodesByTopIds(categoryIds);
+            Map<String, List<PgsProgressCategory>> categoryMap = progressCategoryList.stream()
+                .collect(Collectors.groupingBy(PgsProgressCategory::getName));
+            // 计算集电线路
+            if (categoryMap.containsKey("集电线路")) {
+                List<PgsProgressCategory> categoryList = categoryMap.get("集电线路");
+                List<Long> ids = categoryList.stream().map(PgsProgressCategory::getId).distinct().toList();
+                List<PgsProgressCategory> list = leafNodesByTopIds.stream()
+                    .filter(node -> {
+                        Set<Long> ancestorSet = Arrays.stream(node.getAncestors().split(",")).map(Long::parseLong).collect(Collectors.toSet());
+                        return ids.stream().anyMatch(ancestorSet::contains);
+                    }).toList();
+                BigDecimal percentage = progressCategoryService.getCompletedPercentage(list);
+                if (percentage.compareTo(BigDecimal.ZERO) > 0) {
+                    vo.setCollectorLinePercentage(percentage);
+                }
+            }
+            // 计算送出线路
+            if (categoryMap.containsKey("送出线路")) {
+                List<PgsProgressCategory> categoryList = categoryMap.get("送出线路");
+                List<Long> ids = categoryList.stream().map(PgsProgressCategory::getId).distinct().toList();
+                List<PgsProgressCategory> list = leafNodesByTopIds.stream()
+                    .filter(node -> {
+                        Set<Long> ancestorSet = Arrays.stream(node.getAncestors().split(",")).map(Long::parseLong).collect(Collectors.toSet());
+                        return ids.stream().anyMatch(ancestorSet::contains);
+                    }).toList();
+                BigDecimal percentage = progressCategoryService.getCompletedPercentage(list);
+                if (percentage.compareTo(BigDecimal.ZERO) > 0) {
+                    vo.setExportLinePercentage(percentage);
+                }
+            }
+            // 计算升压站
+            if (categoryMap.containsKey("升压站")) {
+                List<PgsProgressCategory> categoryList = categoryMap.get("升压站");
+                List<Long> ids = categoryList.stream().map(PgsProgressCategory::getId).distinct().toList();
+                List<PgsProgressCategory> list = leafNodesByTopIds.stream()
+                    .filter(node -> {
+                        Set<Long> ancestorSet = Arrays.stream(node.getAncestors().split(",")).map(Long::parseLong).collect(Collectors.toSet());
+                        return ids.stream().anyMatch(ancestorSet::contains);
+                    }).toList();
+                BigDecimal percentage = progressCategoryService.getCompletedPercentage(list);
+                if (percentage.compareTo(BigDecimal.ZERO) > 0) {
+                    vo.setSubstationPercentage(percentage);
+                }
+            }
+            // 计算光伏场区
+            if (categoryMap.containsKey("光伏场区")) {
+                List<PgsProgressCategory> categoryList = categoryMap.get("光伏场区");
+                List<Long> ids = categoryList.stream().map(PgsProgressCategory::getId).distinct().toList();
+                List<PgsProgressCategory> list = leafNodesByTopIds.stream()
+                    .filter(node -> {
+                        Set<Long> ancestorSet = Arrays.stream(node.getAncestors().split(",")).map(Long::parseLong).collect(Collectors.toSet());
+                        return ids.stream().anyMatch(ancestorSet::contains);
+                    }).toList();
+                BigDecimal percentage = progressCategoryService.getCompletedPercentage(list);
+                if (percentage.compareTo(BigDecimal.ZERO) > 0) {
+                    vo.setAreaPercentage(percentage);
+                }
+            }
+        }
+        // 计算道路
+        List<PgsProgressCategory> roadCategoryList = progressCategoryService.lambdaQuery()
+            .in(PgsProgressCategory::getProjectId, projectIds)
+            .like(PgsProgressCategory::getName, "道路")
+            .ne(PgsProgressCategory::getUnitType, PgsProgressUnitTypeEnum.NULL.getValue())
+            .list();
+        if (CollUtil.isNotEmpty(roadCategoryList)) {
+            BigDecimal percentage = progressCategoryService.getCompletedPercentage(roadCategoryList);
+            if (percentage.compareTo(BigDecimal.ZERO) > 0) {
+                vo.setRoadPercentage(percentage);
+            }
+        }
+        // 计算箱变
+        List<PgsProgressCategory> boxTransformerCategoryList = progressCategoryService.lambdaQuery()
+            .in(PgsProgressCategory::getProjectId, projectIds)
+            .like(PgsProgressCategory::getName, "箱变")
+            .ne(PgsProgressCategory::getUnitType, PgsProgressUnitTypeEnum.NULL.getValue())
+            .list();
+        if (CollUtil.isNotEmpty(boxTransformerCategoryList)) {
+            BigDecimal percentage = progressCategoryService.getCompletedPercentage(boxTransformerCategoryList);
+            if (percentage.compareTo(BigDecimal.ZERO) > 0) {
+                vo.setBoxTransformerPercentage(percentage);
+            }
+        }
+        // 计算总进度
+        vo.setTotalPercentage(
+            vo.getCollectorLinePercentage()
+                .add(vo.getExportLinePercentage())
+                .add(vo.getSubstationPercentage())
+                .add(vo.getAreaPercentage())
+                .add(vo.getRoadPercentage())
+                .add(vo.getBoxTransformerPercentage())
+                .divide(BigDecimal.valueOf(6), 2, RoundingMode.HALF_UP) // 保留两位小数
+        );
+        return vo;*/
+    }
 
     /**
      * 获取项目概括
@@ -276,4 +448,190 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
             throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
         }
     }
+
+    @Override
+    public List<String> getList(Long projectId) {
+        if (projectId == null) {
+            throw new ServiceException("项目id不能为空！！！");
+        }
+        Object object = RedisUtils.getCacheObject("xmjdp:" + projectId);
+        if (object == null) {
+            return null;
+        }
+        JSONArray objects = JSONUtil.parseArray(object);
+        return objects.toList(String.class);
+
+    }
+
+    @Override
+    public void setList(GpsEquipmentBo bo) {
+        if (bo.getProjectId() == null) {
+            throw new ServiceException("项目id不能为空！！！");
+        }
+        RedisUtils.setCacheObject("xmjdp:" + bo.getProjectId(), bo.getIdList());
+    }
+
+    @Override
+    public List<Map<String, Object>> getClientList(Long projectId) {
+        // 获取当天的开始时间（00:00:00）
+        LocalDateTime startOfDay = LocalDateTime.now().with(LocalTime.MIN);
+
+        // 获取当前时间
+        LocalDateTime now = LocalDateTime.now();
+        List<GpsEquipmentSonVo> voList = gpsEquipmentService.getClientList(projectId, startOfDay, now);
+        List<GpsEquipmentSonVo> appList = gpsEquipmentService.getUserListByProjectId(projectId, startOfDay, now);
+        List<LocationVo> anqmList = deviceService.getUserListByProjectId(projectId, startOfDay, now);
+        List<OthYs7Device> othYs7DeviceList = othYs7DeviceService.lambdaQuery()
+            .eq(OthYs7Device::getProjectId, projectId)
+//            .between(OthYs7Device::getUpdateTime, startOfDay, now)
+            .list();
+        List<String> wrjKeys = droProjectDroneService.getTopicsByProjectId(projectId);
+        List<Map<String, Object>> maps = new ArrayList<>();
+        Map<String, Object> gpsMap = new HashMap<>();
+        Map<String, Object> anqmMap = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        Map<String, Object> sbMap = new HashMap<>();
+        Map<String, Object> wrjMap = new HashMap<>();
+        Map<String, Object> sxtMap = new HashMap<>();
+        List<Map<String, Object>> gpsChildrenMap = new ArrayList<>();
+        List<Map<String, Object>> sbChildrenMap = new ArrayList<>();
+        List<Map<String, Object>> appChildrenMap = new ArrayList<>();
+        List<Map<String, Object>> anqmChildrenMap = new ArrayList<>();
+        List<Map<String, Object>> wrjChildrenMap = new ArrayList<>();
+        List<Map<String, Object>> sxtChildrenMap = new ArrayList<>();
+        if (voList != null && !voList.isEmpty()) {
+            for (GpsEquipmentSonVo item : voList) {
+                Map<String, Object> gps = new HashMap<>();
+                gps.put("id", item.getClientId());
+                gps.put("userId", item.getUserId());
+                gps.put("label", item.getClientId());
+                gps.put("name", item.getUserId() != null ? item.getUserName() : item.getClientId());
+                gps.put("type", "gps");
+                gps.put("lat", item.getLocLatitude());
+                gps.put("lng", item.getLocLongitude());
+                gps.put("alt", item.getLocAltitude());
+                sbChildrenMap.add(gps);
+            }
+        }
+        if (appList != null && !appList.isEmpty()) {
+            for (GpsEquipmentSonVo item : appList) {
+                Map<String, Object> app = new HashMap<>();
+                app.put("id", item.getUserId());
+                app.put("userId", item.getUserId());
+                app.put("label", item.getUserId());
+                app.put("name", item.getUserName());
+                app.put("type", "app");
+                app.put("lat", item.getLocLatitude());
+                app.put("lng", item.getLocLongitude());
+                app.put("alt", item.getLocAltitude());
+                appChildrenMap.add(app);
+            }
+        }
+        if (anqmList != null && !anqmList.isEmpty()) {
+            for (LocationVo item : anqmList) {
+                Map<String, Object> anqm = new HashMap<>();
+                anqm.put("id", item.getDevNum());
+                anqm.put("userId", item.getUserId());
+                anqm.put("label", item.getDevNum());
+                anqm.put("name", item.getDevNum());
+                anqm.put("type", "positioningDevice");
+                anqm.put("lat", item.getLatitude());
+                anqm.put("lng", item.getLongitude());
+                anqm.put("alt", item.getElevation());
+                anqmChildrenMap.add(anqm);
+            }
+        }
+        if (othYs7DeviceList != null && !othYs7DeviceList.isEmpty()) {
+            for (OthYs7Device item : othYs7DeviceList) {
+                Map<String, Object> sxt = new HashMap<>();
+                sxt.put("id", item.getDeviceSerial());
+                sxt.put("label", item.getDeviceSerial());
+                sxt.put("name", item.getDeviceName());
+                sxt.put("type", "shexiangtou");
+                sxt.put("lat", item.getLatitude());
+                sxt.put("lng", item.getLongitude());
+                sxt.put("alt", item.getAltitude());
+                sxt.put("status", item.getStatus());
+                sxt.put("detail", item.getDetail());
+                sxtChildrenMap.add(sxt);
+            }
+        }
+        if (wrjKeys != null && !wrjKeys.isEmpty()) {
+            for (String key : wrjKeys) {
+                Object object = stringRedisTemplate.opsForValue().get("wrj:osd4:" + key);
+                Object object6 = stringRedisTemplate.opsForValue().get("wrj:osd2:" + key);
+                String status = "";
+                if (object6 != null) {
+                    JSONObject object1 = JSONUtil.parseObj(object6);
+                    status = object1.getJSONObject("data").get("flighttask_step_code").toString();
+                }
+                if (object != null) {
+                    JSONObject object1 = JSONUtil.parseObj(object);
+                    Map<String, Object> wrj = new HashMap<>();
+                    wrj.put("id", key);
+                    wrj.put("label", key);
+                    wrj.put("name", key);
+                    wrj.put("type", "wurenji");
+                    wrj.put("status", status);
+                    wrj.put("lat", object1.getJSONObject("data").get("latitude"));
+                    wrj.put("lng", object1.getJSONObject("data").get("longitude"));
+                    wrj.put("alt", object1.getJSONObject("data").get("height"));
+                    wrjChildrenMap.add(wrj);
+                }else {
+                    Object object2 = stringRedisTemplate.opsForValue().get("wrj:osd3:" + key);
+                    if (object2 != null) {
+                        JSONObject object3 = JSONUtil.parseObj(object2);
+                        Map<String, Object> wrj = new HashMap<>();
+                        wrj.put("id", key);
+                        wrj.put("label", key);
+                        wrj.put("name", key);
+                        wrj.put("type", "wurenji");
+                        wrj.put("status", status);
+                        wrj.put("lat", object3.getJSONObject("data").get("latitude"));
+                        wrj.put("lng", object3.getJSONObject("data").get("longitude"));
+                        wrj.put("alt", object3.getJSONObject("data").get("height"));
+                        wrjChildrenMap.add(wrj);
+                    }
+                }
+            }
+        }
+        gpsChildrenMap.add(sbMap);
+        gpsChildrenMap.add(appMap);
+        gpsChildrenMap.add(anqmMap);
+
+        gpsMap.put("id", 1);
+        gpsMap.put("label", "人员定位");
+        gpsMap.put("children", gpsChildrenMap);
+        sbMap.put("id", 4);
+        sbMap.put("label", "设备定位");
+        sbMap.put("children", sbChildrenMap);
+        appMap.put("id", 5);
+        appMap.put("label", "app定位");
+        appMap.put("children", appChildrenMap);
+        anqmMap.put("id", 6);
+        anqmMap.put("label", "安全帽定位");
+        anqmMap.put("children", anqmChildrenMap);
+        sxtMap.put("id", 2);
+        sxtMap.put("label", "摄像头");
+        sxtMap.put("children", sxtChildrenMap);
+        wrjMap.put("id", 3);
+        wrjMap.put("label", "无人机");
+        wrjMap.put("children", wrjChildrenMap);
+
+
+        maps.add(gpsMap);
+        maps.add(wrjMap);
+        maps.add(sxtMap);
+        return maps;
+    }
+
+    @Override
+    public void setWrjHc() {
+        RedisUtils.setCacheObject("xmjdap:ws",System.currentTimeMillis() );
+    }
+
+    @Override
+    public Map<String, Map<String, Object>> getInfoData(TanchuangInfoReq req) {
+        return projectService.getInfoData(req);
+    }
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java

@@ -1,13 +1,19 @@
 package org.dromara.cailiaoshebei.controller;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.cailiaoshebei.domain.bo.RemainingReq;
 import org.dromara.cailiaoshebei.domain.dto.BusMrpDto;
 import org.dromara.cailiaoshebei.domain.dto.BusMrpExportDto;
 import org.dromara.cailiaoshebei.domain.vo.BusMrpVo;
@@ -16,8 +22,14 @@ import org.dromara.common.core.exception.ServiceException;
 import org.dromara.design.domain.BusBillofquantities;
 import org.dromara.design.domain.BusBillofquantitiesVersions;
 import org.dromara.design.domain.bo.CoryObtainTheListReq;
+import org.dromara.design.domain.vo.ObtainTheListRes;
 import org.dromara.design.service.IBusBillofquantitiesService;
 import org.dromara.design.service.IBusBillofquantitiesVersionsService;
+import org.dromara.tender.domain.bo.BusBiddingPlanBo;
+import org.dromara.tender.domain.vo.BusBiddingPlanVo;
+import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo;
+import org.dromara.tender.service.IBusBiddingPlanService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -52,6 +64,7 @@ public class BusMrpBaseController extends BaseController {
     private final IBusBillofquantitiesVersionsService busBillofquantitiesVersionsService;
 
     private final IBusBillofquantitiesService busBillofquantitiesService;
+    private final IBusBiddingPlanService  busBiddingPlanService;
 
     /**
      * 查询物资-批次需求计划基础信息列表
@@ -123,6 +136,7 @@ public class BusMrpBaseController extends BaseController {
     /**
      * 批量新增或修改
      */
+    @SaCheckPermission("cailiaoshebei:mrpBase:addbatch")
     @RepeatSubmit()
     @PostMapping("/batch")
     public R<Void> batchAddOrUpdate(@RequestBody BusMrpDto dto) {
@@ -133,8 +147,14 @@ public class BusMrpBaseController extends BaseController {
      * 获取剩余量
      */
     @GetMapping("/remaining")
-    public R<BigDecimal> remaining(Long suppliespriceId,Long mrpBaseId) {
+    public R<List<Map<String,Object>>> remaining(  RemainingReq req) {
-        return R.ok(busMrpBaseService.remaining(suppliespriceId,mrpBaseId));
+        String[] split = req.getLimitListId().split(",");
+        List<Map<String, Object>> maps = new ArrayList<>();
+        for (String id : split) {
+            Map<String, Object> remaining = busMrpBaseService.remaining(req.getProjectId(), Long.valueOf(id), req.getMrpBaseId());
+            maps.add(remaining);
+        }
+        return R.ok(maps);
     }
 
 
@@ -167,25 +187,99 @@ public class BusMrpBaseController extends BaseController {
         return R.ok(list);
     }
 
+    /**
+     * 获取工程量清单列表
+     */
+    @SaCheckPermission("cailiaoshebei:mrpBase:getZhaoBiaoList")
+    @GetMapping("/getZhaoBiaoList")
+    public R<List<BusBiddingPlanVo>> getZhaoBiaoList(CoryObtainTheListReq req) {
+        BusBiddingPlanBo bo = new BusBiddingPlanBo();
+        bo.setProjectId(req.getProjectId());
+        bo.setType("3");
+        bo.setBidStatus(1);
+        List<BusBiddingPlanVo> busBiddingPlanVos = busBiddingPlanService.queryList(bo);
+        return R.ok(busBiddingPlanVos);
+    }
+
+    /**
+     * 招标计划数据详情
+     * @param bo
+     * @return
+     */
+    @SaCheckPermission("cailiaoshebei:mrpBase:getMore")
+    @GetMapping("/getMore")
+    public R<List<BusBillofquantitiesLimitListVo>> getMore(BusBiddingPlanBo bo) {
+        if (bo.getId() == null) {
+            throw new ServiceException("id不能为空");
+        }
+        return R.ok(busBiddingPlanService.getMore(bo));
+    }
+
+
     /**
      * 获取工程量清单列表
      */
     @SaCheckPermission("cailiaoshebei:purchaseDoc:coryEngineeringList")
     @GetMapping("/coryEngineeringList")
     public R<List<BusBillofquantities>> obtainTheList(CoryObtainTheListReq req) {
-        BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.<BusBillofquantitiesVersions>lambdaQuery()
+//    public R<List<ObtainTheListRes>> obtainTheList(CoryObtainTheListReq req) {
-            .eq(BusBillofquantitiesVersions::getWorkOrderType, "3") //物资工程量清单
+//        BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.<BusBillofquantitiesVersions>lambdaQuery()
-            .eq(BusBillofquantitiesVersions::getProjectId, req.getProjectId())
+//            .eq(BusBillofquantitiesVersions::getWorkOrderType, "3") //物资工程量清单
-            .eq(BusBillofquantitiesVersions::getVersions, req.getVersions())
+//            .eq(BusBillofquantitiesVersions::getProjectId, req.getProjectId())
-            .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus())
+//            .eq(BusBillofquantitiesVersions::getVersions, req.getVersions())
-            .last("limit 1")
+//            .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus())
-        );
+//            .last("limit 1")
-        if (one == null){
+//        );
-            throw  new ServiceException("请先完成物资工程量清单");
+//        if (one == null){
+//            throw  new ServiceException("请先完成物资工程量清单");
+//        }
+//        List<BusBillofquantities> list = busBillofquantitiesService.list(Wrappers.<BusBillofquantities>lambdaQuery()
+//            .eq(BusBillofquantities::getVersions, one.getVersions())
+//        );
+//        return R.ok(list);
+//        List<ObtainTheListRes> obtainTheListRes = new ArrayList<>();
+//        list.forEach(billofquantities -> {
+//            ObtainTheListRes res = new ObtainTheListRes();
+//            BeanUtils.copyProperties(billofquantities, res);
+//            obtainTheListRes.add(res);
+//        });
+//
+//        Map<String, List<ObtainTheListRes>> parentMap = obtainTheListRes.stream()
+//            .collect(Collectors.groupingBy(ObtainTheListRes::getPid));
+//
+//        // 3. 递归组装树形结构，从顶级节点（pid=0）开始
+//        List<ObtainTheListRes> treeList = buildTree("0", parentMap);
+//        return R.ok(treeList);
+        List<BusBillofquantities> busBillofquantities = busBillofquantitiesService.getBaseMapper()
+            .selectList(new LambdaQueryWrapper<BusBillofquantities>()
+                .eq(BusBillofquantities::getProjectId, req.getProjectId())
+                .eq(BusBillofquantities::getName, req.getSid()));
+        List<String> sids = new ArrayList<>();
+        busBillofquantities.forEach(busBillofquantities1 -> {
+            sids.add(busBillofquantities1.getSid());
+        });
+        return R.ok(busBillofquantitiesService
+            .getBaseMapper()
+            .selectList(new LambdaQueryWrapper<BusBillofquantities>()
+                .eq(BusBillofquantities::getProjectId, req.getProjectId())
+                .in(BusBillofquantities::getPid, sids)));
     }
-        List<BusBillofquantities> list = busBillofquantitiesService.list(Wrappers.<BusBillofquantities>lambdaQuery()
+
-            .eq(BusBillofquantities::getVersions, one.getVersions())
+    private List<ObtainTheListRes> buildTree(String parentId, Map<String, List<ObtainTheListRes>> parentMap) {
-        );
+        // 获取当前父节点的所有直接子节点
-        return R.ok(list);
+        List<ObtainTheListRes> children = parentMap.getOrDefault(parentId, Collections.emptyList());
+        if (children.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        // 为每个子节点递归设置其下一级子节点
+        for (ObtainTheListRes child : children) {
+            // 递归查询当前子节点的子节点，设置为它的子树
+            List<ObtainTheListRes> subChildren = buildTree(child.getSid(), parentMap);
+            // 注意：需要在Vo中添加子节点列表字段，用于存储子树
+            child.setChildren(subChildren);
+        }
+
+        return children;
     }
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java

@@ -1,6 +1,7 @@
 package org.dromara.cailiaoshebei.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
@@ -9,6 +10,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.cailiaoshebei.domain.BusPlanDocAssociation;
 import org.dromara.cailiaoshebei.domain.bo.BusMaterialbatchdemandplanBo;
 import org.dromara.cailiaoshebei.domain.bo.BusPurchaseDocBo;
+import org.dromara.cailiaoshebei.domain.bo.FeedbackDto;
 import org.dromara.cailiaoshebei.domain.vo.BusMaterialbatchdemandplanVo;
 import org.dromara.cailiaoshebei.domain.vo.BusPurchaseDocVo;
 import org.dromara.cailiaoshebei.service.IBusMaterialbatchdemandplanService;
@@ -33,8 +35,12 @@ import org.dromara.design.service.IBusBillofquantitiesVersionsService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 物资-采购联系单
@@ -67,6 +73,8 @@ public class BusPurchaseDocController extends BaseController {
         return busPurchaseDocService.queryPageList(bo, pageQuery);
     }
 
+
+
     /**
      * 导出物资-采购联系单列表
      */
@@ -157,13 +165,36 @@ public class BusPurchaseDocController extends BaseController {
                                                       @PathVariable("id") Long id) {
         List<BusPlanDocAssociation> list = planDocAssociationService.list(Wrappers.lambdaQuery(BusPlanDocAssociation.class)
             .eq(BusPlanDocAssociation::getDocId, id));
-        List<Long> list1 = list.stream().map(BusPlanDocAssociation::getPlanId).toList();
+        if (CollectionUtil.isEmpty(list)) {
-        if (list1.isEmpty()) {
             return R.ok(new ArrayList<>());
         }
+        Map<Long, BigDecimal> collect = list.stream()
+            .filter(Objects::nonNull) // 过滤空对象
+            .collect(Collectors.toMap(
+                BusPlanDocAssociation::getPlanId,
+                BusPlanDocAssociation::getDemandQuantity,
+                (existing, replacement) -> existing // 保留第一个遇到的重复键
+            ));
         BusMaterialbatchdemandplanBo bo = new BusMaterialbatchdemandplanBo();
-        bo.setIds(list1);
+        bo.setIds(new ArrayList<>(collect.keySet()));
-        return R.ok(materialbatchdemandplanService.queryList(bo));
+        List<BusMaterialbatchdemandplanVo> busMaterialbatchdemandplanVos = materialbatchdemandplanService.queryList(bo);
+        for (BusMaterialbatchdemandplanVo busMaterialbatchdemandplanVo : busMaterialbatchdemandplanVos) {
+             busMaterialbatchdemandplanVo.setDemandQuantity(collect.get(busMaterialbatchdemandplanVo.getId()));
+        }
+        return R.ok(busMaterialbatchdemandplanVos);
+    }
+
+
+
+    /**
+     * 修改回单
+     */
+    @SaCheckPermission("cailiaoshebei:purchaseDoc:edit")
+    @Log(title = "物资-采购联系单", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/updateFeedback")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FeedbackDto bo) {
+        return toAjax(busPurchaseDocService.updateFeedback(bo));
     }
 
 //

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusTotalsupplyplanController.java

@@ -1,32 +1,33 @@
 package org.dromara.cailiaoshebei.controller;
 
-import java.util.List;
-
-import cn.hutool.core.bean.BeanUtil;
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
 import org.dromara.cailiaoshebei.domain.bo.BusTotalsupplyplanAuditBo;
+import org.dromara.cailiaoshebei.domain.bo.BusTotalsupplyplanBo;
 import org.dromara.cailiaoshebei.domain.bo.MasterDataReq;
 import org.dromara.cailiaoshebei.domain.bo.TotalsupplyplanQueryListReq;
 import org.dromara.cailiaoshebei.domain.dto.MasterDataReqDto;
 import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanAuditVo;
+import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanVo;
 import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanAuditService;
-import org.springframework.web.bind.annotation.*;
+import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanService;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.cailiaoshebei.domain.vo.BusTotalsupplyplanVo;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.cailiaoshebei.domain.bo.BusTotalsupplyplanBo;
+import org.dromara.common.log.annotation.Log;
-import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanService;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * 物资-总供应计划
@@ -82,6 +83,16 @@ public class BusTotalsupplyplanController extends BaseController {
         ExcelUtil.exportExcel(list, "物资-总供应计划", BusTotalsupplyplanVo.class, response);
     }
 
+    /**
+     * 导入物资-总供应计划数据
+     */
+    @SaCheckPermission("design:totalsupplyplan:import")
+    @Log(title = "物资-总供应计划", businessType = BusinessType.IMPORT)
+    @PostMapping("/import")
+    public R<Void> importData(@RequestPart("file") MultipartFile file) {
+        return toAjax(busTotalsupplyplanService.importData(file));
+    }
+
     /**
      * 获取物资-总供应计划详细信息
      *
@@ -116,6 +127,17 @@ public class BusTotalsupplyplanController extends BaseController {
         return toAjax(busTotalsupplyplanService.updateByBo(bo));
     }
 
+    /**
+     * 批量修改物资-总供应计划
+     */
+    @SaCheckPermission("design:totalsupplyplan:batchEdit")
+    @Log(title = "物资-总供应计划", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/batchEdit")
+    public R<Void> batchEdit(@Validated(EditGroup.class) @RequestBody List<BusTotalsupplyplanBo> boList) {
+        return toAjax(busTotalsupplyplanService.updateBatch(boList));
+    }
+
 //    /**
 //     * 删除物资-总供应计划
 //     *

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/app/BusMrpBaseAppController.java

@@ -0,0 +1,160 @@
+package org.dromara.cailiaoshebei.controller.app;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.cailiaoshebei.domain.bo.BusMrpBaseBo;
+import org.dromara.cailiaoshebei.domain.dto.BusMrpDto;
+import org.dromara.cailiaoshebei.domain.dto.BusMrpExportDto;
+import org.dromara.cailiaoshebei.domain.vo.BusMrpBaseVo;
+import org.dromara.cailiaoshebei.domain.vo.BusMrpVo;
+import org.dromara.cailiaoshebei.service.IBusMrpBaseService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.enums.BusinessStatusEnum;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.design.domain.BusBillofquantities;
+import org.dromara.design.domain.BusBillofquantitiesVersions;
+import org.dromara.design.domain.bo.CoryObtainTheListReq;
+import org.dromara.design.domain.bo.ObtainAllVersionNumbersReq;
+import org.dromara.design.domain.vo.BusBillofquantitiesVo;
+import org.dromara.design.domain.vo.ObtainTheListRes;
+import org.dromara.design.service.IBusBillofquantitiesService;
+import org.dromara.design.service.IBusBillofquantitiesVersionsService;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * app物资-批次需求计划基础信息
+ *
+ * @author Lion Li
+ * @date 2025-08-13
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/cailiaoshebei/mrpBase")
+public class BusMrpBaseAppController extends BaseController {
+
+    private final IBusMrpBaseService busMrpBaseService;
+
+    private final IBusBillofquantitiesVersionsService busBillofquantitiesVersionsService;
+
+    private final IBusBillofquantitiesService busBillofquantitiesService;
+
+    /**
+     * 查询物资-批次需求计划基础信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<BusMrpBaseVo> list(BusMrpBaseBo bo, PageQuery pageQuery) {
+        return busMrpBaseService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 获取物资-批次需求计划基础信息详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<BusMrpVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(busMrpBaseService.queryById(id));
+    }
+
+
+    /**
+     * 删除物资-批次需求计划基础信息
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "物资-批次需求计划基础信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(busMrpBaseService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 批量新增或修改
+     */
+    @RepeatSubmit()
+    @PostMapping("/batch")
+    public R<Void> batchAddOrUpdate(@RequestBody BusMrpDto dto) {
+        return toAjax(busMrpBaseService.batchAddOrUpdate(dto));
+    }
+
+    /**
+     * 获取剩余量
+     */
+    @GetMapping("/remaining")
+    public R<Map<String,Object>> remaining(Long projectId,Long limitListId,Long mrpBaseId) {
+        return R.ok(busMrpBaseService.remaining(projectId,limitListId,mrpBaseId));
+    }
+
+
+    /**
+     * 获取所有大类
+     */
+    @GetMapping("/obtainAllClassification")
+    public R<List<BusBillofquantitiesVo>> obtainAllClassification(ObtainAllVersionNumbersReq bo) {
+        return R.ok(busBillofquantitiesVersionsService.obtainAllClassification(bo));
+    }
+
+
+    /**
+     * 获取工程量清单列表
+     */
+    @GetMapping("/coryEngineeringList")
+    public R<List<BusBillofquantities>> obtainTheList(CoryObtainTheListReq req) {
+        List<BusBillofquantities> busBillofquantities = busBillofquantitiesService.getBaseMapper()
+            .selectList(new LambdaQueryWrapper<BusBillofquantities>()
+                .eq(BusBillofquantities::getProjectId, req.getProjectId())
+                .eq(BusBillofquantities::getName, req.getSid()));
+        List<String> sids = new ArrayList<>();
+        busBillofquantities.forEach(busBillofquantities1 -> {
+            sids.add(busBillofquantities1.getSid());
+        });
+        return R.ok(busBillofquantitiesService
+            .getBaseMapper()
+            .selectList(new LambdaQueryWrapper<BusBillofquantities>()
+                .eq(BusBillofquantities::getProjectId, req.getProjectId())
+                .in(BusBillofquantities::getPid, sids)));
+    }
+
+    private List<ObtainTheListRes> buildTree(String parentId, Map<String, List<ObtainTheListRes>> parentMap) {
+        // 获取当前父节点的所有直接子节点
+        List<ObtainTheListRes> children = parentMap.getOrDefault(parentId, Collections.emptyList());
+        if (children.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        // 为每个子节点递归设置其下一级子节点
+        for (ObtainTheListRes child : children) {
+            // 递归查询当前子节点的子节点，设置为它的子树
+            List<ObtainTheListRes> subChildren = buildTree(child.getSid(), parentMap);
+            // 注意：需要在Vo中添加子节点列表字段，用于存储子树
+            child.setChildren(subChildren);
+        }
+
+        return children;
+    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/app/BusPurchaseDocAppController.java

@@ -0,0 +1,214 @@
+package org.dromara.cailiaoshebei.controller.app;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.cailiaoshebei.domain.BusPlanDocAssociation;
+import org.dromara.cailiaoshebei.domain.bo.BusMaterialbatchdemandplanBo;
+import org.dromara.cailiaoshebei.domain.bo.BusPurchaseDocBo;
+import org.dromara.cailiaoshebei.domain.bo.FeedbackDto;
+import org.dromara.cailiaoshebei.domain.vo.BusMaterialbatchdemandplanVo;
+import org.dromara.cailiaoshebei.domain.vo.BusPurchaseDocVo;
+import org.dromara.cailiaoshebei.service.IBusMaterialbatchdemandplanService;
+import org.dromara.cailiaoshebei.service.IBusPlanDocAssociationService;
+import org.dromara.cailiaoshebei.service.IBusPurchaseDocService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.design.service.IBusBillofquantitiesService;
+import org.dromara.design.service.IBusBillofquantitiesVersionsService;
+import org.dromara.tender.domain.bo.TenderSupplierInputBo;
+import org.dromara.tender.domain.vo.TenderSupplierInputVo;
+import org.dromara.tender.service.ITenderSupplierInputService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * app物资-采购联系单
+ *
+ * @author Lion Li
+ * @date 2025-08-13
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/cailiaoshebei/purchaseDoc")
+public class BusPurchaseDocAppController extends BaseController {
+
+    private final IBusPurchaseDocService busPurchaseDocService;
+
+    private final IBusMaterialbatchdemandplanService materialbatchdemandplanService;
+
+    private final IBusPlanDocAssociationService planDocAssociationService;
+
+    private final IBusBillofquantitiesVersionsService busBillofquantitiesVersionsService;
+
+    private final IBusBillofquantitiesService busBillofquantitiesService;
+
+    private final ITenderSupplierInputService tenderSupplierInputService;
+
+
+    /**
+     * 查询物资-采购联系单列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<BusPurchaseDocVo> list(BusPurchaseDocBo bo, PageQuery pageQuery) {
+        return busPurchaseDocService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询供应商入库列表
+     */
+    @GetMapping("/supList")
+    public TableDataInfo<TenderSupplierInputVo> list(TenderSupplierInputBo bo, PageQuery pageQuery) {
+        return tenderSupplierInputService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询物资-批次需求计划列表
+     */
+    @GetMapping("/planList")
+    public TableDataInfo<BusMaterialbatchdemandplanVo> list(BusMaterialbatchdemandplanBo bo, PageQuery pageQuery) {
+        return materialbatchdemandplanService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 获取物资-采购联系单详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<BusPurchaseDocVo> getInfo(@NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(busPurchaseDocService.queryById(id));
+    }
+
+    /**
+     * 获取物资-采购联系单详细PDF
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("cailiaoshebei:purchaseDoc:pdf")
+    @GetMapping("/pdf/{id}")
+    public R<String> getPic(@NotNull(message = "主键不能为空")
+                            @PathVariable Long id) {
+        return R.ok("操作成功", busPurchaseDocService.queryPicBase64ById(id));
+    }
+
+    /**
+     * 新增物资-采购联系单
+     */
+    @SaCheckPermission("cailiaoshebei:purchaseDoc:add")
+    @Log(title = "物资-采购联系单", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody BusPurchaseDocBo bo) {
+        return toAjax(busPurchaseDocService.insertByBo(bo));
+    }
+
+    /**
+     * 修改物资-采购联系单
+     */
+    @SaCheckPermission("cailiaoshebei:purchaseDoc:edit")
+    @Log(title = "物资-采购联系单", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BusPurchaseDocBo bo) {
+        return toAjax(busPurchaseDocService.updateByBo(bo));
+    }
+
+    /**
+     * 删除物资-采购联系单
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("cailiaoshebei:purchaseDoc:remove")
+    @Log(title = "物资-采购联系单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(busPurchaseDocService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+
+    /**
+     * 查询采购单关联的计划
+     */
+    @GetMapping("/planList/{id}")
+    public R<List<BusMaterialbatchdemandplanVo>> list(@NotNull(message = "主键不能为空")
+                                                      @PathVariable("id") Long id) {
+        List<BusPlanDocAssociation> list = planDocAssociationService.list(Wrappers.lambdaQuery(BusPlanDocAssociation.class)
+            .eq(BusPlanDocAssociation::getDocId, id));
+        if (CollectionUtil.isEmpty(list)) {
+            return R.ok(new ArrayList<>());
+        }
+        Map<Long, BigDecimal> collect = list.stream()
+            .filter(Objects::nonNull) // 过滤空对象
+            .collect(Collectors.toMap(
+                BusPlanDocAssociation::getPlanId,
+                BusPlanDocAssociation::getDemandQuantity,
+                (existing, replacement) -> existing // 保留第一个遇到的重复键
+            ));
+        BusMaterialbatchdemandplanBo bo = new BusMaterialbatchdemandplanBo();
+        bo.setIds(new ArrayList<>(collect.keySet()));
+        List<BusMaterialbatchdemandplanVo> busMaterialbatchdemandplanVos = materialbatchdemandplanService.queryList(bo);
+        for (BusMaterialbatchdemandplanVo busMaterialbatchdemandplanVo : busMaterialbatchdemandplanVos) {
+             busMaterialbatchdemandplanVo.setDemandQuantity(collect.get(busMaterialbatchdemandplanVo.getId()));
+        }
+        return R.ok(busMaterialbatchdemandplanVos);
+    }
+
+
+
+    /**
+     * 修改回单
+     */
+    @Log(title = "物资-采购联系单", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/updateFeedback")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FeedbackDto bo) {
+        return toAjax(busPurchaseDocService.updateFeedback(bo));
+    }
+
+//
+//    /**
+//     * 获取工程量清单列表
+//     */
+//    @SaCheckPermission("cailiaoshebei:purchaseDoc:add")
+//    @GetMapping("/engineeringList")
+//    public R<List<BusBillofquantities>> obtainTheList(Long projectId) {
+//        BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.<BusBillofquantitiesVersions>lambdaQuery()
+//            .eq(BusBillofquantitiesVersions::getWorkOrderType, "3") //物资工程量清单
+//            .eq(BusBillofquantitiesVersions::getProjectId, projectId)
+//            .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus())
+//            .last("limit 1")
+//        );
+//        if (one == null) {
+//            throw new ServiceException("请先完成物资工程量清单");
+//        }
+//        List<BusBillofquantities> list = busBillofquantitiesService.list(Wrappers.<BusBillofquantities>lambdaQuery()
+//            .eq(BusBillofquantities::getVersions, one.getVersions())
+//        );
+//
+//        return R.ok(list);
+//    }
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/constant.java

@@ -19,6 +19,7 @@ public class constant {
     public static final String PURCHASE_DOC_FILE_URL = "docs/purchase/doc/"; // 采购联系单文件路径
     public static final String PURCHASE_DOC_TEMPLATE_PATH = "template/物资采购联系单模版.docx"; // 采购联系单文件路径
     public static final String SUPPLIER_INPUT = "supplierInput";//供应商入库
+    public static final String BusFormalitiesAreConsolidatedMoveOut = "ConsolidatedMoveOut";
 
     /**
      * 获取物资采购联系单文件名

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusMaterialbatchdemandplan.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -51,6 +52,8 @@ public class BusMaterialbatchdemandplan extends BaseEntity {
      */
     private Long suppliespriceId;
 
+    private Long suppliespricePid;
+
     /**
      * 基础信息ID
      */
@@ -94,7 +97,7 @@ public class BusMaterialbatchdemandplan extends BaseEntity {
     /**
      * 计划到场时间
      */
-    private Date arrivalTime;
+    private LocalDate arrivalTime;
 
     /**
      * 备注

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusPlanDocAssociation.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 物资-批次需求计划与采购单关联对象 bus_plan_doc_association
@@ -37,6 +38,11 @@ public class BusPlanDocAssociation extends BaseEntity {
      */
     private Long planId;
 
+    /**
+     * 需求数量
+     */
+    private BigDecimal demandQuantity;
+
     /**
      * 采购联系单id
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusTotalsupplyplan.java

@@ -1,14 +1,14 @@
 package org.dromara.cailiaoshebei.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import org.dromara.common.mybatis.core.domain.BaseEntity;
-import java.time.LocalDate;
-import java.util.Date;
 
 import java.io.Serial;
+import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * 物资-总供应计划对象 bus_totalsupplyplan
@@ -35,6 +35,16 @@ public class BusTotalsupplyplan extends BaseEntity {
      */
     private Long projectId;
 
+    /**
+     * 批次ID
+     */
+    private String sid;
+
+    /**
+     * 批次父ID
+     */
+    private String pid;
+
     /**
      * 批次号
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialbatchdemandplanBo.java

@@ -114,4 +114,12 @@ public class BusMaterialbatchdemandplanBo extends BaseEntity {
      * 主键集合
      */
     private List<Long> ids;
+
+
+    /**
+     * 供应商id
+     */
+    private Long supplierId;
+
+    private Long suppliespricePid;
 }