Zyzf/PIbd-22_Kalyshev_SUBD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some add

Browse Source
This commit is contained in:
Калышев Ян 2023-04-25 08:52:16 +04:00
parent 096476287f
commit 815f40af70
11 changed files with 154 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SUBD-back/src/main/java/com/subd/subd/Controllers/CustomRequest.java Normal file
View File

@ -0,0 +1,20 @@
package com.subd.subd.Controllers;
import com.subd.subd.Models.Order;
import com.subd.subd.Repositories.OrderRepository;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
public class CustomRequest {
private final OrderRepository orderRepository;
public CustomRequest(OrderRepository orderRepository) {
this.orderRepository = orderRepository;
}
@GetMapping("/custom")
public List<Order> performCustomRequest() {
return orderRepository.customAction();
}
}

11
SUBD-back/src/main/java/com/subd/subd/Repositories/OrderRepository.java
View File

@ -2,6 +2,17 @@ package com.subd.subd.Repositories;
import com.subd.subd.Models.Order; import com.subd.subd.Models.Order;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
public interface OrderRepository extends JpaRepository<Order, Long> { public interface OrderRepository extends JpaRepository<Order, Long> {
// @Query(value = "SELECT \"ORDER\".ID, \"ORDER\".DATE, \"ORDER\".STATUS, \"CAR\".GOS_NUMBER, \"DRIVER\".NAME as driver_name, \"CLIENT\".NAME as client_name FROM \"order\" " +
// "JOIN \"CAR\" ON CAR.ID = \"ORDER\".CAR_ID " +
// "JOIN \"DRIVER\" ON \"CAR\".DRIVER_ID = \"DRIVER\".ID " +
// "JOIN \"CLIENT\" ON \"CLIENT\".ID = \"ORDER\".CLIENT_ID " +
// "WHERE \"ORDER\".DATE > '2000-01-01' AND \"ORDER\".VALUE > 10000 AND \"ORDER\".STATUS like 'delivered' " +
// "ORDER BY DATE", nativeQuery = true)
@Query(value = "SELECT * FROM \"order\"", nativeQuery = true)
List<Order> customAction();
} }

10
SUBD-back/src/main/resources/application.properties
View File

@ -1,7 +1,7 @@
spring.jpa.hibernate.ddl-auto=none spring.jpa.hibernate.ddl-auto=create
spring.datasource.initialization-mode=always spring.datasource.initialization-mode=always
spring.datasource.platform=postgres spring.datasource.platform=postgres
spring.datasource.url=jdbc:postgresql://109.197.199.134:5432/subd spring.datasource.url=jdbc:postgresql://192.168.43.105:5432/subd
spring.datasource.username=postgres spring.datasource.username=yan
spring.datasource.password=250303Zyzf-d-grad spring.datasource.password=250303zyzf
spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=false spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true

1
SUBD-front/index.html
View File

@ -7,6 +7,7 @@
<title>Vite App</title> <title>Vite App</title>
</head> </head>
<body> <body>
<script type="module" src="/node_modules/jquery/dist/jquery.min.js"></script>
<div id="app"></div> <div id="app"></div>
<script type="module" src="/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script> <script type="module" src="/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script type="module" src="/src/main.js"></script> <script type="module" src="/src/main.js"></script>

6
SUBD-front/package-lock.json generated
View File

@ -11,6 +11,7 @@
"axios": "^1.3.6", "axios": "^1.3.6",
"bootstrap": "^5.2.3", "bootstrap": "^5.2.3",
"email-generator": "^1.0.1", "email-generator": "^1.0.1",
"jquery": "^3.6.4",
"vue": "^3.2.47", "vue": "^3.2.47",
"vue-router": "^4.1.6" "vue-router": "^4.1.6"
}, },
@ -1410,6 +1411,11 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/jquery": {
"version": "3.6.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz",
"integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ=="
},
"node_modules/js-tokens": { "node_modules/js-tokens": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

1
SUBD-front/package.json
View File

@ -11,6 +11,7 @@
"axios": "^1.3.6", "axios": "^1.3.6",
"bootstrap": "^5.2.3", "bootstrap": "^5.2.3",
"email-generator": "^1.0.1", "email-generator": "^1.0.1",
"jquery": "^3.6.4",
"vue": "^3.2.47", "vue": "^3.2.47",
"vue-router": "^4.1.6" "vue-router": "^4.1.6"
}, },

2
SUBD-front/src/components/DataTable.vue
View File

@ -32,7 +32,7 @@
if (data == "inDelivery") { if (data == "inDelivery") {
return "В пути"; return "В пути";
} }
if (data == "delvered") { if (data == "delivered") {
return "Доставлен"; return "Доставлен";
} }
if (data == "issued") { if (data == "issued") {

2
SUBD-front/src/components/Generator.vue
View File

@ -1,4 +1,3 @@
<!-- const emails = require('email-generator'); -->
<script> <script>
import DataService from '../services/DataService'; import DataService from '../services/DataService';
import Client from '../models/Client'; import Client from '../models/Client';
@ -127,7 +126,6 @@
this.data = []; this.data = [];
this.transformer = (data) => new Car(data); this.transformer = (data) => new Car(data);
this.data = this.transformer(); this.data = this.transformer();
console.log(this.data)
for (let i = 0; i < count; i++) { for (let i = 0; i < count; i++) {
this.data.gosNumber = generateString(6); this.data.gosNumber = generateString(6);
this.data.vin = generateString(25); this.data.vin = generateString(25);

27
SUBD-front/src/components/MeasureTime.vue Normal file
View File

@ -0,0 +1,27 @@
<script>
export default {
methods: {
customRequest() {
// let dataUrlPrefix = 'http://localhost:8080/';
// const response = axios.get(this.dataUrlPrefix + 'custom');
// response.data.map(item => console.log(item));
$.ajax({
url: "/src/database.php",
type: 'get',
data: {request: 'fetchall'},
dataType: 'json',
success: function (response) {
document.getElementsByClassName('input-group')[0].innerHTML(response);
}
});
}
}
}
</script>
<template>
<div class="input-group mb-3">
<input type="text" class="form-control" required id="clientCount" placeholder="Количество клиентов">
<button class="btn btn-primary" type="button" @click.prevent="customRequest">Сгенерировать</button>
</div>
</template>

79
SUBD-front/src/database.php Normal file
View File

@ -0,0 +1,79 @@
<p>
<?php
$host = "192.168.43.105";
$user = "yan";
$password = "250303zyzf";
$dbname = "subd";
$con = pg_connect("host=$host dbname=$dbname user=$user password=$password");
if (!$con) {
die('Connection failed.');
}
$request = "";
if(isset($_POST['request'])){
$request = $_POST['request'];
}
// Fetch all records
if($request == 'fetchall'){
$query = "SELECT "order".ID, "order".DATE, "order".STATUS, "car".GOS_NUMBER, "driver".NAME as driver_name, "client".NAME as client_name FROM "order" JOIN CAR ON CAR.ID = "order".CAR_ID JOIN DRIVER ON CAR.DRIVER_ID = DRIVER.ID JOIN CLIENT ON CLIENT.ID = "order".CLIENT_ID WHERE "order".DATE > '2000-01-01' AND "order".VALUE > 10000 AND "order".STATUS like 'delivered' ORDER BY date;";
$result = pg_query($con, $query);
$response = array();
while ($row = pg_fetch_assoc($result) ){
$id = $row['id'];
$username = $row['username'];
$fullname = $row['fullname'];
$email = $row['email'];
$response[] = array(
"id" => $id,
"username" => $username,
"fullname" => $fullname,
"email" => $email,
);
}
echo json_encode($response);
die;
}
// Fetch record by id
if($request == 'fetchbyid'){
$userid = 0;
if(isset($_POST['userid']) && is_numeric($_POST['userid']) ){
$userid = $_POST['userid'];
}
$query = "SELECT * FROM users WHERE id=".$userid;
$result = pg_query($con, $query);
$response = array();
if (pg_numrows($result) > 0) {
$row = pg_fetch_assoc($result);
$id = $row['id'];
$username = $row['username'];
$fullname = $row['fullname'];
$email = $row['email'];
$response[] = array(
"id" => $id,
"username" => $username,
"fullname" => $fullname,
"email" => $email,
);
}
echo json_encode($response);
die;
}
</p>

4
SUBD-front/src/main.js
View File

@ -4,11 +4,13 @@ import './style.css'
import App from './App.vue' import App from './App.vue'
import Orders from './components/Orders.vue' import Orders from './components/Orders.vue'
import Generator from './components/Generator.vue' import Generator from './components/Generator.vue'
import MeasureTime from './components/MeasureTime.vue'
const routes = [ const routes = [
{ path: '/', redirect: '/orders' }, { path: '/', redirect: '/orders' },
{ path: '/orders', component: Orders, meta: { label: 'Заказы' }}, { path: '/orders', component: Orders, meta: { label: 'Заказы' }},
{ path: '/generator', component: Generator, meta: { label: 'Генератор' }} { path: '/generator', component: Generator, meta: { label: 'Генератор' }},
{ path: '/measureTime', component: MeasureTime, meta: { label: 'Замер времени' }}
] ]
const router = createRouter({ const router = createRouter({