Home Verkennen Help
Inloggen
uskycloud
/
usky-modules
3
2
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

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

fuyuchuan 2 maanden geleden
bovenliggende
8049cef2fb 25850a8a22
commit
8d7d485a10
22 gewijzigde bestanden met toevoegingen van 100 en 12 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  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. 7 2
      service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/mqtt/alarm/Alarm.java
  6. 4 0
      service-fire/service-fire-biz/pom.xml
  7. 2 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/RuoYiSystemApplication.java
  8. 4 0
      service-iot/service-iot-biz/pom.xml
  9. 2 0
      service-iot/service-iot-biz/src/main/java/com/usky/iot/RuoYiSystemApplication.java
  10. 2 0
      service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceTypeService.java
  11. 2 0
      service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpProductInfoService.java
  12. 1 1
      service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmDeviceRepairServiceImpl.java
  13. 15 0
      service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceTypeServiceImpl.java
  14. 25 6
      service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductInfoServiceImpl.java
  15. 5 0
      service-issue/service-issue-biz/pom.xml
  16. 2 0
      service-issue/service-issue-biz/src/main/java/com/usky/issue/RuoYiSystemApplication.java
  17. 4 0
      service-oa/service-oa-biz/pom.xml
  18. 2 0
      service-oa/service-oa-biz/src/main/java/com/usky/oa/ServiceOaApplication.java
  19. 4 0
      service-pm/service-pm-biz/pom.xml
  20. 2 0
      service-pm/service-pm-biz/src/main/java/com/usky/pm/PmApplication.java
  21. 4 0
      service-website/service-website-biz/pom.xml
  22. 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
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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")

+ 7 - 2
service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/mqtt/alarm/Alarm.java
Bestand weergeven 

@@ -56,13 +56,18 @@ public class Alarm implements MqttStrategy {
 
         List<DmpDevice> list = dmpDeviceService.list(queryWrapper1);
 
         baseAlarm.setDeviceId(alarams.get(0).get("devId").toString());
 
         baseAlarm.setAlarmTime(time2);
 
-        baseAlarm.setAlarmType(dp.get(0).get("serial").toString());
 
+        String alarmType = dp.get(0).get("serial").toString();
 
+        baseAlarm.setAlarmType(alarmType);
 
         baseAlarm.setAlarmObject(alarams.get(0).get("deviceName").toString());
 
         baseAlarm.setAlarmData(dp.get(0).get("status").toString());
 
         baseAlarm.setAlarmAttribute(dp.get(0).get("property").toString());
 
         if (alarams.get(0).get("deviceType").equals("1")){
 
             baseAlarm.setAlarmContent(dp.get(0).get("property").toString()+","+dp.get(0).get("value").toString());
 
-            baseAlarm.setAlarmGrade(1);
 
+            if(alarmType.equals("812") || alarmType.equals("815") || alarmType.equals("819")){
 
+                baseAlarm.setAlarmGrade(1);
 
+            }else{
 
+                baseAlarm.setAlarmGrade(2);
 
+            }
 
             baseAlarm.setAlarmAddress(dp.get(0).get("value").toString());
 
         }else if (alarams.get(0).get("deviceType").equals("2")){
 
             baseAlarm.setAlarmContent(dp.get(0).get("property").toString()+","+dp.get(0).get("value").toString());

+ 4 - 0
service-fire/service-fire-biz/pom.xml
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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")

+ 2 - 0
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceTypeService.java
Bestand weergeven 

@@ -20,6 +20,8 @@ public interface DmpDeviceTypeService extends CrudService<DmpDeviceType> {
 
 
     boolean checkNameUnique(DmpDeviceType dmpDeviceType);
 
 
+    boolean checkTypeCodeUnique(DmpDeviceType dmpDeviceType);
 
+
 
     void edit(DmpDeviceType dmpDeviceType);
 
 
     void remove(Integer id);

+ 2 - 0
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpProductInfoService.java
Bestand weergeven 

@@ -25,6 +25,8 @@ public interface DmpProductInfoService extends CrudService<DmpProductInfo> {
 
 
     boolean checkNameUnique(DmpProductInfo dmpProductInfo);
 
 
+    boolean checkProductNameUnique(DmpProductInfo dmpProductInfo);
 
+
 
     CommonPage<DmpProductInfo> page(DmpProductInfoRequest dmpProductInfoRequest);
 
 
     boolean remove(Integer id);

+ 1 - 1
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmDeviceRepairServiceImpl.java
Bestand weergeven 

@@ -63,7 +63,7 @@ public class CrmDeviceRepairServiceImpl extends AbstractCrudService<CrmDeviceRep
 
         IAcsClient client = new DefaultAcsClient(profile);
 
         SendSmsRequest request = new SendSmsRequest();
 
         request.setPhoneNumbers(crmDeviceRepair.getReflectPhone());//接收短信的手机号码
 
-        request.setSignName("上海永天科技股份有限公司");//短信签名名称
 
+        request.setSignName("售后服务");//短信签名名称
 
         request.setTemplateCode("SMS_463225651");//短信模板CODE
 
 
         request.setTemplateParam("{\"name\":\""+crmDeviceRepair.getReflectName()+"\"}");//短信模板变量对应的实际值

+ 15 - 0
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceTypeServiceImpl.java
Bestand weergeven 

@@ -42,6 +42,9 @@ public class DmpDeviceTypeServiceImpl extends AbstractCrudService<DmpDeviceTypeM
 
         if (checkNameUnique(dmpDeviceType)) {
 
             throw new BusinessException("新增设备类型'" + dmpDeviceType.getTypeName() + "'失败，该设备类型已经存在");
 
         }
 
+        if (checkTypeCodeUnique(dmpDeviceType)) {
 
+            throw new BusinessException("新增设备类型'" + dmpDeviceType.getTypeName() + "'失败，该设备类型编码已经存在");
 
+        }
 
         dmpDeviceType.setCreatedBy(SecurityUtils.getUsername());
 
         dmpDeviceType.setCreatedTime(LocalDateTime.now());
 
         dmpDeviceType.setTenantId(SecurityUtils.getTenantId());
 
@@ -54,6 +57,9 @@ public class DmpDeviceTypeServiceImpl extends AbstractCrudService<DmpDeviceTypeM
 
         if (checkNameUnique(dmpDeviceType)) {
 
             throw new BusinessException("修改设备类型'" + dmpDeviceType.getTypeName() + "'失败，该设备类型已经存在");
 
         }
 
+        if (checkTypeCodeUnique(dmpDeviceType)) {
 
+            throw new BusinessException("修改设备类型'" + dmpDeviceType.getTypeName() + "'失败，该设备类型编码已经存在");
 
+        }
 
         dmpDeviceType.setUpdatedBy(SecurityUtils.getUsername());
 
         dmpDeviceType.setUpdatedTime(LocalDateTime.now());
 
         this.updateById(dmpDeviceType);
 
@@ -68,6 +74,15 @@ public class DmpDeviceTypeServiceImpl extends AbstractCrudService<DmpDeviceTypeM
 
         return null != one && !Objects.equals(one.getId(), id);
 
     }
 
 
+    @Override
 
+    public boolean checkTypeCodeUnique(DmpDeviceType dmpDeviceType) {
 
+        Integer id = null == dmpDeviceType.getId() ? -1 : dmpDeviceType.getId();
 
+        LambdaQueryWrapper<DmpDeviceType> queryWrapper = Wrappers.lambdaQuery();
 
+        queryWrapper.like(DmpDeviceType::getTypeCode, dmpDeviceType.getTypeCode());
 
+        DmpDeviceType one = this.getOne(queryWrapper);
 
+        return null != one && !Objects.equals(one.getId(), id);
 
+    }
 
+
 
     @Override
 
     public void remove(Integer id) {
 
         DmpDeviceType one = this.getById(id);

+ 25 - 6
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductInfoServiceImpl.java
Bestand weergeven 

@@ -69,7 +69,10 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
 
 
         for (int k = 0; k < dmpProductInfo.size(); k++) {
 
             if (checkNameUnique(dmpProductInfo.get(k))){
 
-                throw new BusinessException("新增产品信息'" + dmpProductInfo.get(k).getProductCode() + "'失败，产品信息已存在");
 
+                throw new BusinessException("新增产品信息'" + dmpProductInfo.get(k).getProductCode() + "'失败，产品编码已存在");
 
+            }
 
+            if (checkProductNameUnique(dmpProductInfo.get(k))){
 
+                throw new BusinessException("新增产品信息'" + dmpProductInfo.get(k).getProductName() + "'失败，产品名称已存在");
 
             }
 
             int deviceType = dmpProductInfo.get(k).getDeviceType();
 
             LambdaQueryWrapper<DmpDeviceType> queryWrapper = Wrappers.lambdaQuery();
 
@@ -111,8 +114,6 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
 
                             int data_type = obj.getInteger("data_type");
 
                             int attribute_length = obj.getInteger("attribute_length");
 
                             String attribute_unit = obj.getString("attribute_unit");
 
-                            int maximum = obj.getInteger("maximum");
 
-                            int minimum = obj.getInteger("minimum");
 
 
                             DmpProductAttribute dmpProductAttribute = new DmpProductAttribute();
 
                             dmpProductAttribute.setProductId(productId);
 
@@ -123,8 +124,12 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
 
                             dmpProductAttribute.setDataType(data_type);
 
                             dmpProductAttribute.setAttributeLength(attribute_length);
 
                             dmpProductAttribute.setAttributeUnit(attribute_unit);
 
-                            dmpProductAttribute.setMaximum(BigDecimal.valueOf(maximum));
 
-                            dmpProductAttribute.setMinimum(BigDecimal.valueOf(minimum));
 
+                            if(Objects.nonNull(obj.getInteger("maximum"))){
 
+                                dmpProductAttribute.setMaximum(BigDecimal.valueOf(obj.getInteger("maximum")));
 
+                            }
 
+                            if(Objects.nonNull(obj.getInteger("minimum"))){
 
+                                dmpProductAttribute.setMinimum(BigDecimal.valueOf(obj.getInteger("minimum")));
 
+                            }
 
                             if(!(obj.getString("attribute_dict")).equals("")){
 
                                 dmpProductAttribute.setAttributeDict(obj.getString("attribute_dict"));
 
                             }
 
@@ -181,7 +186,10 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
 
     public void update(DmpProductInfo dmpProductInfo) {
 
         dmpProductInfo.setUpdatedTime(new Date());
 
         if (checkNameUnique(dmpProductInfo)){
 
-            throw new BusinessException("修改产品信息'" + dmpProductInfo.getProductCode() + "'失败，产品信息已存在");
 
+            throw new BusinessException("修改产品信息'" + dmpProductInfo.getProductCode() + "'失败，产品编码已存在");
 
+        }
 
+        if (checkProductNameUnique(dmpProductInfo)){
 
+            throw new BusinessException("修改产品信息'" + dmpProductInfo.getProductName() + "'失败，产品名称已存在");
 
         }
 
         this.updateById(dmpProductInfo);
 
     }
 
@@ -197,6 +205,17 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
 
         return null != one && !Objects.equals(one.getId(), id);
 
     }
 
 
+    @Override
 
+    public boolean checkProductNameUnique(DmpProductInfo dmpProductInfo) { //根据产品名称判断唯一
 
+        Integer id = null == dmpProductInfo.getId() ? -1 : dmpProductInfo.getId();
 
+        LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
 
+        queryWrapper.eq(DmpProductInfo::getProductName,dmpProductInfo.getProductName())
 
+                .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId())
 
+                .eq(DmpProductInfo::getDeleteFlag,0);
 
+        DmpProductInfo one = this.getOne(queryWrapper);
 
+        return null != one && !Objects.equals(one.getId(), id);
 
+    }
 
+
 
 
     @Override
 
     public CommonPage<DmpProductInfo> page(DmpProductInfoRequest piRequest) {

+ 5 - 0
service-issue/service-issue-biz/pom.xml
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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")

+ 4 - 0
service-website/service-website-biz/pom.xml
Bestand weergeven 

@@ -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
Bestand weergeven 

@@ -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")