Przeglądaj źródła

2023年9月25日09:44:55

纪新园 1 rok temu
rodzic
commit
38fe24027f

+ 1 - 11
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -14,17 +14,7 @@ public class RuoYiApplication
 {
     public static void main(String[] args)
     {
-        // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ノ゙  若依启动成功   ლ(´ڡ`ლ)゙  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+        System.out.println("(♥◠‿◠)ノ゙  工业物联网系统启动成功   ლ(´ڡ`ლ)゙  ");
     }
 }

+ 37 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/OrderController.java

@@ -0,0 +1,37 @@
+package com.ruoyi.web.controller.iot;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.web.controller.iot.domain.Order;
+import com.ruoyi.web.controller.iot.service.IOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author :jixinyuan
+ * @date : 2023/9/25
+ */
+@RestController
+@RequestMapping("/business/order")
+public class OrderController extends BaseController {
+
+    @Autowired
+    private IOrderService orderService;
+
+    /**
+     * 获取部门列表
+     */
+    @GetMapping("/list")
+    public AjaxResult list(Order order)
+    {
+        List<Order> orderList = orderService.list(order);
+        return success(orderList);
+    }
+
+}

+ 8 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/domain/Order.java

@@ -0,0 +1,8 @@
+package com.ruoyi.web.controller.iot.domain;
+
+/**
+ * @author :jixinyuan
+ * @date : 2023/9/25
+ */
+public class Order {
+}

+ 15 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/service/IOrderService.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.controller.iot.service;
+
+import com.ruoyi.web.controller.iot.domain.Order;
+
+import java.util.List;
+
+/**
+ * @author :jixinyuan
+ * @date : 2023/9/25
+ */
+public interface IOrderService {
+
+
+    List<Order> list(Order order);
+}

+ 41 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/service/impl/OrderServiceImpl.java

@@ -0,0 +1,41 @@
+package com.ruoyi.web.controller.iot.service.impl;
+
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.web.controller.iot.domain.Order;
+import com.ruoyi.web.controller.iot.service.IOrderService;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.jdbc.support.rowset.SqlRowSet;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author :jixinyuan
+ * @date : 2023/9/25
+ */
+@Service
+public class OrderServiceImpl implements IOrderService {
+
+    @Override
+    public List<Order> list(Order order) {
+        try {
+            DriverManagerDataSource dataSource = new DriverManagerDataSource();
+            dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+            dataSource.setUrl("jdbc:mysql://47.94.195.4:3525/boyo_fb4a88d6f6f24d67953f68c4fe829f63?useUnicode=true&useSSL=false&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai");
+            dataSource.setUsername("db_cdyq6tkqn1ioja179i8b");
+            dataSource.setPassword("By@#5c9i75sgtx3b620g6m6e");
+
+            JdbcTemplate template = new JdbcTemplate(dataSource);
+            SqlRowSet sqlRowSet = template.queryForRowSet("SELECT * FROM 't_factory_order';");
+
+            System.err.println("返回数据:"+sqlRowSet);
+
+        } catch (Exception e) {
+            System.err.println(e.getMessage());
+            return null;
+//            return new ResponseEntity<ResponseStatusDto>(ResponseStatusDto.createErrorDto(e.getMessage(), e), HttpStatus.ACCEPTED);
+        }
+        return null;
+    }
+}

+ 6 - 6
ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://123.60.138.20:3306/iot_database?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: password
+                password: daasan7ujm^YHN
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
+                enabled: true
+                url: jdbc:mysql://47.94.195.4:3525/iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: wdy_iot
+                password: DF5!Oe^NJj7$f2vY
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

+ 5 - 5
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -31,7 +31,7 @@ import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 登录校验方法
- * 
+ *
  * @author ruoyi
  */
 @Component
@@ -45,7 +45,7 @@ public class SysLoginService
 
     @Autowired
     private RedisCache redisCache;
-    
+
     @Autowired
     private ISysUserService userService;
 
@@ -54,7 +54,7 @@ public class SysLoginService
 
     /**
      * 登录验证
-     * 
+     *
      * @param username 用户名
      * @param password 密码
      * @param code 验证码
@@ -64,7 +64,7 @@ public class SysLoginService
     public String login(String username, String password, String code, String uuid)
     {
         // 验证码校验
-        validateCaptcha(username, code, uuid);
+//        validateCaptcha(username, code, uuid);
         // 登录前置校验
         loginPreCheck(username, password);
         // 用户验证
@@ -102,7 +102,7 @@ public class SysLoginService
 
     /**
      * 校验验证码
-     * 
+     *
      * @param username 用户名
      * @param code 验证码
      * @param uuid 唯一标识