tda

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

@@ -6,23 +6,23 @@ spring:
             driver-class-name: com.mysql.cj.jdbc.Driver
             datasource:
                 wms:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 item:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 supply:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 base:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 iot:
-                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
 

hx-admin/src/main/resources/application-test.yml

@@ -5,20 +5,24 @@ spring:
             strict: true
             driver-class-name: com.mysql.cj.jdbc.Driver
             datasource:
+                wms:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
                 item:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 supply:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 base:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
                 iot:
-                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
 

hx-iot/src/main/java/com/fjhx/iot/entity/tda/dto/TdaProductSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class TdaProductSelectDto extends BaseSelectDto {
 
+    /**
+     * 资源空间表id
+     */
+    private Long tdaApplicationId;
+
 }

hx-iot/src/main/java/com/fjhx/iot/service/tda/impl/TdaApplicationServiceImpl.java

@@ -11,6 +11,7 @@ import com.fjhx.iot.mapper.tda.TdaApplicationMapper;
 import com.fjhx.iot.service.tda.TdaApplicationService;
 import com.fjhx.iot.utils.IoTDAUtil;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 
 
@@ -28,6 +29,11 @@ public class TdaApplicationServiceImpl extends ServiceImpl<TdaApplicationMapper,
     @Override
     public Page<TdaApplicationVo> getPage(TdaApplicationSelectDto dto) {
         IWrapper<TdaApplication> wrapper = getWrapper();
+        wrapper.keyword(dto,
+                new SqlField("tc.name"),
+                new SqlField("ta.app_name")
+        );
+
         wrapper.orderByDesc("ta", TdaApplication::getId);
         Page<TdaApplicationVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;

hx-iot/src/main/java/com/fjhx/iot/service/tda/impl/TdaConfigServiceImpl.java

@@ -12,6 +12,7 @@ import com.fjhx.iot.listener.DtaListener;
 import com.fjhx.iot.mapper.tda.TdaConfigMapper;
 import com.fjhx.iot.service.tda.TdaConfigService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 
 import javax.jms.JMSException;
@@ -32,6 +33,7 @@ public class TdaConfigServiceImpl extends ServiceImpl<TdaConfigMapper, TdaConfig
     @Override
     public Page<TdaConfigVo> getPage(TdaConfigSelectDto dto) {
         IWrapper<TdaConfig> wrapper = getWrapper();
+        wrapper.keyword(dto, new SqlField("tc.name"));
         wrapper.orderByDesc("tc", TdaConfig::getId);
         Page<TdaConfigVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;

hx-iot/src/main/java/com/fjhx/iot/service/tda/impl/TdaDeviceServiceImpl.java

@@ -15,6 +15,7 @@ import com.fjhx.iot.service.tda.TdaDeviceService;
 import com.fjhx.iot.service.tda.TdaProductService;
 import com.fjhx.iot.utils.IoTDAUtil;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -44,6 +45,7 @@ public class TdaDeviceServiceImpl extends ServiceImpl<TdaDeviceMapper, TdaDevice
     public Page<TdaDeviceVo> getPage(TdaDeviceSelectDto dto) {
         IWrapper<TdaDevice> wrapper = getWrapper();
         wrapper.orderByDesc("td", TdaDevice::getId);
+        wrapper.keyword(dto, new SqlField("td.device_name"));
         Page<TdaDeviceVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

hx-iot/src/main/java/com/fjhx/iot/service/tda/impl/TdaProductServiceImpl.java

@@ -13,6 +13,7 @@ import com.fjhx.iot.service.tda.TdaApplicationService;
 import com.fjhx.iot.service.tda.TdaProductService;
 import com.fjhx.iot.utils.IoTDAUtil;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +35,8 @@ public class TdaProductServiceImpl extends ServiceImpl<TdaProductMapper, TdaProd
     @Override
     public Page<TdaProductVo> getPage(TdaProductSelectDto dto) {
         IWrapper<TdaProduct> wrapper = getWrapper();
+        wrapper.eq("tp", TdaProduct::getTdaApplicationId, dto.getTdaApplicationId());
+        wrapper.keyword(dto, new SqlField("tp.name"));
         wrapper.orderByDesc("tp", TdaProduct::getId);
         Page<TdaProductVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;