Главная Обзор Помощь
Вход
uskycloud
/
usky-modules
3
2
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-modules into fu-dev

fuyuchuan 1 неделя назад
Родитель
5088c6e4b4 f83e36c430
Сommit
d21786588d
18 измененных файлов с 78 добавлено и 7 удалено
Разделённый вид Показать статистику Diff
  1. 3 1
      service-ai/service-ai-biz/src/main/resources/static/dpsk.html
  2. 2 1
      service-ai/service-ai-biz/src/main/resources/static/tyqw.html
  3. 4 0
      service-alarm/service-alarm-biz/pom.xml
  4. 2 1
      service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/RuoYiSystemApplication.java
  5. 4 0
      service-fire/service-fire-biz/pom.xml
  6. 2 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/RuoYiSystemApplication.java
  7. 4 0
      service-iot/service-iot-biz/pom.xml
  8. 2 0
      service-iot/service-iot-biz/src/main/java/com/usky/iot/RuoYiSystemApplication.java
  9. 5 0
      service-issue/service-issue-biz/pom.xml
  10. 2 0
      service-issue/service-issue-biz/src/main/java/com/usky/issue/RuoYiSystemApplication.java
  11. 4 0
      service-oa/service-oa-biz/pom.xml
  12. 2 0
      service-oa/service-oa-biz/src/main/java/com/usky/oa/ServiceOaApplication.java
  13. 4 0
      service-pm/service-pm-biz/pom.xml
  14. 2 0
      service-pm/service-pm-biz/src/main/java/com/usky/pm/PmApplication.java
  15. 1 0
      service-pm/service-pm-biz/src/main/java/com/usky/pm/service/config/DingTalkAndMessage.java
  16. 29 4
      service-pm/service-pm-biz/src/main/java/com/usky/pm/service/impl/PmWorkReportServiceImpl.java
  17. 4 0
      service-website/service-website-biz/pom.xml
  18. 2 0
      service-website/service-website-biz/src/main/java/com/usky/website/WebSiteApplication.java

+ 3 - 1
service-ai/service-ai-biz/src/main/resources/static/dpsk.html
Просмотреть файл 

@@ -1,3 +1,4 @@
 
+<!--
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 <head>
 
@@ -146,4 +147,5 @@
 
     })
 
 </script>
 
 </body>
 
-</html>
 
+</html>
 
+-->

+ 2 - 1
service-ai/service-ai-biz/src/main/resources/static/tyqw.html
Просмотреть файл 

@@ -1,3 +1,4 @@
 
+<!--
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 <head>
 
@@ -146,4 +147,4 @@
 
     })
 
 </script>
 
 </body>
 
-</html>
 
+</html>-->

+ 4 - 0
service-alarm/service-alarm-biz/pom.xml
Просмотреть файл 

@@ -62,6 +62,10 @@
 
             <version>0.0.1</version>
 
             <scope>compile</scope>
 
         </dependency>
 
+        <dependency>
 
+            <groupId>com.usky</groupId>
 
+            <artifactId>ruoyi-common-swagger</artifactId>
 
+        </dependency>
 
     </dependencies>
 
 
     <build>

+ 2 - 1
service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/RuoYiSystemApplication.java
Просмотреть файл 

@@ -1,6 +1,7 @@
 
 package com.usky.alarm;
 
 
 
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 
 import org.mybatis.spring.annotation.MapperScan;
 
 import org.slf4j.Logger;
 
 import org.slf4j.LoggerFactory;
 
@@ -20,7 +21,7 @@ import java.net.UnknownHostException;
 
  * @author ruoyi
 
  */
 
 
-
 
+@EnableCustomSwagger2
 
 @EnableFeignClients(basePackages = "com.usky")
 
 @MapperScan(value = "com.usky.alarm.mapper")
 
 @ComponentScan("com.usky")

+ 4 - 0
service-fire/service-fire-biz/pom.xml
Просмотреть файл 

@@ -121,6 +121,10 @@
 
             <version>0.0.1</version>
 
             <scope>compile</scope>
 
         </dependency>
 
+        <dependency>
 
+            <groupId>com.usky</groupId>
 
+            <artifactId>ruoyi-common-swagger</artifactId>
 
+        </dependency>
 
 
     </dependencies>

+ 2 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/RuoYiSystemApplication.java
Просмотреть файл 

@@ -1,6 +1,7 @@
 
 package com.usky.fire;
 
 
 
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 
 import org.mybatis.spring.annotation.MapperScan;
 
 import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 
 import org.springframework.boot.SpringApplication;
 
@@ -15,6 +16,7 @@ import org.springframework.context.annotation.ComponentScan;
 
  */
 
 
 //@EnableRabbit
 
+@EnableCustomSwagger2
 
 @EnableFeignClients(basePackages = "com.usky")
 
 @MapperScan(value = "com.usky.fire.mapper")
 
 @ComponentScan("com.usky")

+ 4 - 0
service-iot/service-iot-biz/pom.xml
Просмотреть файл 

@@ -117,6 +117,10 @@
 
             <artifactId>alibaba-dingtalk-service-sdk</artifactId>
 
             <version>2.0.0</version>
 
         </dependency>
 
+        <dependency>
 
+            <groupId>com.usky</groupId>
 
+            <artifactId>ruoyi-common-swagger</artifactId>
 
+        </dependency>
 
 
     </dependencies>

+ 2 - 0
service-iot/service-iot-biz/src/main/java/com/usky/iot/RuoYiSystemApplication.java
Просмотреть файл 

@@ -2,6 +2,7 @@ package com.usky.iot;
 
 
 
 
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 
 import com.usky.iot.constant.constant;
 
 import io.swagger.annotations.SwaggerDefinition;
 
 import lombok.val;
 
@@ -31,6 +32,7 @@ import java.net.UnknownHostException;
 
  */
 
 
 //@EnableSwagger2
 
+@EnableCustomSwagger2
 
 @EnableFeignClients(basePackages = "com.usky")
 
 @MapperScan(value = "com.usky.iot.mapper")
 
 @ComponentScan("com.usky")

+ 5 - 0
service-issue/service-issue-biz/pom.xml
Просмотреть файл 

@@ -61,6 +61,11 @@
 
             <artifactId>spring-websocket</artifactId>
 
             <version>5.2.8.RELEASE</version>
 
         </dependency>
 
+        <dependency>
 
+            <groupId>com.usky</groupId>
 
+            <artifactId>ruoyi-common-swagger</artifactId>
 
+        </dependency>
 
+
 
     </dependencies>
 
 
     <build>

+ 2 - 0
service-issue/service-issue-biz/src/main/java/com/usky/issue/RuoYiSystemApplication.java
Просмотреть файл 

@@ -2,6 +2,7 @@ package com.usky.issue;
 
 
 
 
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 
 import org.mybatis.spring.annotation.MapperScan;
 
 import org.slf4j.Logger;
 
 import org.slf4j.LoggerFactory;
 
@@ -22,6 +23,7 @@ import java.net.UnknownHostException;
 
  */
 
 
 //@EnableSwagger2
 
+@EnableCustomSwagger2
 
 @EnableFeignClients(basePackages = "com.usky")
 
 @MapperScan(value = "com.usky.issue.mapper")
 
 @ComponentScan("com.usky")

+ 4 - 0
service-oa/service-oa-biz/pom.xml
Просмотреть файл 

@@ -56,6 +56,10 @@
 
             <artifactId>dom4j</artifactId>
 
             <version>2.1.4</version>
 
         </dependency>-->
 
+        <dependency>
 
+            <groupId>com.usky</groupId>
 
+            <artifactId>ruoyi-common-swagger</artifactId>
 
+        </dependency>
 
 
     </dependencies>

+ 2 - 0
service-oa/service-oa-biz/src/main/java/com/usky/oa/ServiceOaApplication.java
Просмотреть файл 

@@ -1,4 +1,5 @@
 
 package com.usky.oa;
 
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 
 import io.swagger.annotations.SwaggerDefinition;
 
 import org.mybatis.spring.annotation.MapperScan;
 
 import org.slf4j.Logger;
 
@@ -21,6 +22,7 @@ import java.net.UnknownHostException;
 
  */
 
 
 //@EnableSwagger2
 
+@EnableCustomSwagger2
 
 @EnableFeignClients(basePackages = "com.usky")
 
 @MapperScan(value = "com.usky.oa.mapper")
 
 @ComponentScan("com.usky")

+ 4 - 0
service-pm/service-pm-biz/pom.xml
Просмотреть файл 

@@ -56,6 +56,10 @@
 
             <artifactId>alibaba-dingtalk-service-sdk</artifactId>
 
             <version>2.0.0</version>
 
         </dependency>
 
+        <dependency>
 
+            <groupId>com.usky</groupId>
 
+            <artifactId>ruoyi-common-swagger</artifactId>
 
+        </dependency>
 
     </dependencies>
 
 
     <build>

+ 2 - 0
service-pm/service-pm-biz/src/main/java/com/usky/pm/PmApplication.java
Просмотреть файл 

@@ -1,5 +1,6 @@
 
 package com.usky.pm;
 
 
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 
 import org.mybatis.spring.annotation.MapperScan;
 
 import org.slf4j.Logger;
 
 import org.slf4j.LoggerFactory;
 
@@ -22,6 +23,7 @@ import java.net.UnknownHostException;
 
  */
 
 
 //@EnableSwagger2
 
+@EnableCustomSwagger2
 
 @EnableFeignClients(basePackages = "com.usky")
 
 @MapperScan(value = "com.usky.pm.mapper")
 
 @ComponentScan("com.usky")

+ 1 - 0
service-pm/service-pm-biz/src/main/java/com/usky/pm/service/config/DingTalkAndMessage.java
Просмотреть файл 

@@ -329,6 +329,7 @@ public class DingTalkAndMessage {
 
         mceRequestVO.setId(newReport.getId());
 
         mceRequestVO.setInfoTypeName(INFO_TITLE);
 
         mceRequestVO.setUserName(username);
 
+        mceRequestVO.setRealName(nickName.getNickName());
 
 
         if (!userId.isEmpty()) {
 
             mceRequestVO.setUserIds(userId);

+ 29 - 4
service-pm/service-pm-biz/src/main/java/com/usky/pm/service/impl/PmWorkReportServiceImpl.java
Просмотреть файл 

@@ -11,10 +11,7 @@ import com.usky.pm.domain.PmProject;
 
 import com.usky.pm.domain.PmReceive;
 
 import com.usky.pm.domain.PmWorkContent;
 
 import com.usky.pm.domain.PmWorkReport;
 
-import com.usky.pm.mapper.PmReceiveMapper;
 
-import com.usky.pm.mapper.PmWorkContentMapper;
 
-import com.usky.pm.mapper.PmWorkReportMapper;
 
-import com.usky.pm.mapper.SysUserMapper;
 
+import com.usky.pm.mapper.*;
 
 import com.usky.pm.service.PmProjectService;
 
 import com.usky.pm.service.PmWorkContentService;
 
 import com.usky.pm.service.PmWorkReportService;
 
@@ -79,6 +76,9 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
 
     @Autowired
 
     private RemoteMceService remoteMceService;
 
 
+    @Autowired
 
+    private PmProjectMapper pmProjectMapper;
 
+
 
     private static final String INFO_TITLE = "日报未提交提醒";
 
     private static final String INFO_CONTENT = "您今天的日报还未提交，别忘记哦~";
 
     private static final int INFO_TYPE = 5;
 
@@ -239,6 +239,15 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
 
         if (workContents == null) {
 
             throw new BusinessException("报告内容不能为空，请检查后提交！");
 
         } else {
 
+
 
+            // 查询租户下所有项目
 
+            LambdaQueryWrapper<PmProject> queryWrapper = Wrappers.lambdaQuery();
 
+            queryWrapper.select(PmProject::getId, PmProject::getProjectName)
 
+                    .eq(PmProject::getTenantId, tenantId)
 
+                    .eq(PmProject::getDelFlag, 0);
 
+            Map<Integer, String> projectMap = pmProjectMapper.selectList(queryWrapper).stream()
 
+                    .collect(Collectors.toMap(PmProject::getId, PmProject::getProjectName));
 
+
 
             for (PmWorkContent workContent : workContents) {
 
                 BigDecimal workTime = workContent.getWorkTime();
 
                 // 单个工时大于零
 
@@ -257,6 +266,22 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
 
                 if (StringUtils.isBlank(workContent1)) {
 
                     throw new BusinessException("工作内容不能为空，请检查后提交！");
 
                 }
 
+
 
+                // 检查项目ID是否有效
 
+                if (workContent.getProjectId() == null || workContent.getProjectId() <= 0) {
 
+                    throw new BusinessException("项目ID无效，请选择正确项目后提交。");
 
+                }
 
+
 
+                // 检查项目名称是否为空
 
+                if (StringUtils.isBlank(workContent.getProjectName())) {
 
+                    throw new BusinessException("项目名称不能为空，请检查后提交。");
 
+                }
 
+
 
+                // 检查项目ID和项目名称是否匹配
 
+                if (!projectMap.containsKey(workContent.getProjectId()) ||
 
+                        !projectMap.get(workContent.getProjectId()).equals(workContent.getProjectName())) {
 
+                    throw new BusinessException("项目不存在或项目名称不匹配，请检查后提交。");
 
+                }
 
             }
 
         }
 
         Set<Integer> projectIds2 = new HashSet<>();

+ 4 - 0
service-website/service-website-biz/pom.xml
Просмотреть файл 

@@ -24,6 +24,10 @@
 
             <groupId>com.github.pagehelper</groupId>
 
             <artifactId>pagehelper-spring-boot-starter</artifactId>
 
         </dependency>
 
+        <dependency>
 
+            <groupId>com.usky</groupId>
 
+            <artifactId>ruoyi-common-swagger</artifactId>
 
+        </dependency>
 
 
 
     </dependencies>

+ 2 - 0
service-website/service-website-biz/src/main/java/com/usky/website/WebSiteApplication.java
Просмотреть файл 

@@ -1,6 +1,7 @@
 
 package com.usky.website;
 
 
 
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 
 import org.mybatis.spring.annotation.MapperScan;
 
 import org.slf4j.Logger;
 
 import org.slf4j.LoggerFactory;
 
@@ -22,6 +23,7 @@ import java.net.UnknownHostException;
 
  */
 
 
 @EnableCaching
 
+@EnableCustomSwagger2
 
 @EnableFeignClients(basePackages = "com.usky")
 
 @MapperScan(value = "com.usky.website.mapper")
 
 @ComponentScan("com.usky")