2 Commits 3dcc14bed4 ... 6ed40ea1fd

Autore SHA1 Messaggio Data
  Vyacheslav Vinokurov 6ed40ea1fd Merge branch 'master' of https://git.physics.itmo.ru/v.vinokurov/lowfield_mri_programs 2 settimane fa
  Vyacheslav Vinokurov 878739bc50 Transfer REST DB to Postgres 2 settimane fa
24 ha cambiato i file con 40 aggiunte e 2 eliminazioni
  1. 7 0
      spectrometer_service/mserv00/AddDevices.bat
  2. 27 0
      spectrometer_service/mserv00/CreateDB.sql
  3. BIN
      spectrometer_service/mserv00/mserv00/__pycache__/__init__.cpython-313.pyc
  4. BIN
      spectrometer_service/mserv00/mserv00/__pycache__/settings.cpython-313.pyc
  5. BIN
      spectrometer_service/mserv00/mserv00/__pycache__/urls.cpython-313.pyc
  6. BIN
      spectrometer_service/mserv00/mserv00/__pycache__/wsgi.cpython-313.pyc
  7. 6 2
      spectrometer_service/mserv00/mserv00/settings.py
  8. BIN
      spectrometer_service/mserv00/spectrometer/__pycache__/__init__.cpython-313.pyc
  9. BIN
      spectrometer_service/mserv00/spectrometer/__pycache__/admin.cpython-313.pyc
  10. BIN
      spectrometer_service/mserv00/spectrometer/__pycache__/apps.cpython-313.pyc
  11. BIN
      spectrometer_service/mserv00/spectrometer/__pycache__/engine.cpython-313.pyc
  12. BIN
      spectrometer_service/mserv00/spectrometer/__pycache__/interfaces.cpython-313.pyc
  13. BIN
      spectrometer_service/mserv00/spectrometer/__pycache__/models.cpython-313.pyc
  14. BIN
      spectrometer_service/mserv00/spectrometer/__pycache__/serializers.cpython-313.pyc
  15. BIN
      spectrometer_service/mserv00/spectrometer/__pycache__/urls.cpython-313.pyc
  16. BIN
      spectrometer_service/mserv00/spectrometer/__pycache__/views.cpython-313.pyc
  17. BIN
      spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0001_initial.cpython-313.pyc
  18. BIN
      spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0002_measurement_data_channel_data.cpython-313.pyc
  19. BIN
      spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0003_remove_channel_data_measurement_data.cpython-313.pyc
  20. BIN
      spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0004_state_engine.cpython-313.pyc
  21. BIN
      spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0005_remove_state_engine_measurement_info_engine.cpython-313.pyc
  22. BIN
      spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0006_channel_data_measurement_data_and_more.cpython-313.pyc
  23. BIN
      spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0007_adc_params_averaging_measurement_data_averaging_num.cpython-313.pyc
  24. BIN
      spectrometer_service/mserv00/spectrometer/migrations/__pycache__/__init__.cpython-313.pyc

+ 7 - 0
spectrometer_service/mserv00/AddDevices.bat

@@ -0,0 +1,7 @@
+curl -v -u specadmin:specadmin -X POST -H "Content-Type: application/json" -d "{\"device_type\": \"ADC\", \"brend\": \"Picoscope\", \"serial_model\": \"PS4000A\", \"proto\": \"adc_default\", \"proto_interface\": \"TCP\"}" http://localhost:8000/api/devices/
+
+curl -v -u specadmin:specadmin -X POST -H "Content-Type: application/json" -d "{\"device_type\": \"SDR\", \"brend\": \"HackRF\", \"serial_model\": \"HackRF\", \"proto\": \"sdr_default\", \"proto_interface\": \"USB\"}" http://localhost:8000/api/devices/
+
+curl -v -u specadmin:specadmin -X POST -H "Content-Type: application/json" -d "{\"device_type\": \"SYNC\", \"brend\": \"Arduino\", \"serial_model\": \"DuePP\", \"proto\": \"sync_default\", \"proto_interface\": \"USB\"}" http://localhost:8000/api/devices/
+
+curl -v -u specadmin:specadmin -X POST -H "Content-Type: application/json" -d "{\"device_type\": \"GRA\", \"brend\": \"ITMO\", \"serial_model\": \"GRU\", \"proto\": \"gra_default\", \"proto_interface\": \"UDP\"}" http://localhost:8000/api/devices/

+ 27 - 0
spectrometer_service/mserv00/CreateDB.sql

@@ -0,0 +1,27 @@
+CREATE ROLE specadmin WITH
+	LOGIN
+	NOSUPERUSER
+	NOCREATEDB
+	NOCREATEROLE
+	INHERIT
+	NOREPLICATION
+	NOBYPASSRLS
+	CONNECTION LIMIT -1
+	PASSWORD 'specadmin';
+
+CREATE DATABASE specdata
+    WITH
+    OWNER = specadmin
+    ENCODING = 'UTF8'
+    LOCALE_PROVIDER = 'libc'
+    CONNECTION LIMIT = -1
+    IS_TEMPLATE = False;
+
+ALTER ROLE specadmin IN DATABASE specdata
+    SET "TimeZone" TO 'UTC';
+ALTER ROLE specadmin IN DATABASE specdata
+    SET client_encoding TO 'utf8';
+ALTER ROLE specadmin IN DATABASE specdata
+    SET default_transaction_isolation TO 'read committed';
+
+GRANT ALL ON DATABASE specdata TO specadmin;

BIN
spectrometer_service/mserv00/mserv00/__pycache__/__init__.cpython-313.pyc


BIN
spectrometer_service/mserv00/mserv00/__pycache__/settings.cpython-313.pyc


BIN
spectrometer_service/mserv00/mserv00/__pycache__/urls.cpython-313.pyc


BIN
spectrometer_service/mserv00/mserv00/__pycache__/wsgi.cpython-313.pyc


+ 6 - 2
spectrometer_service/mserv00/mserv00/settings.py

@@ -77,8 +77,12 @@ WSGI_APPLICATION = 'mserv00.wsgi.application'
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'specdata',
+        'USER': 'specadmin',
+        'PASSWORD': 'specadmin',
+        'HOST': 'localhost',
+        'PORT': '5432',
     }
 }
 

BIN
spectrometer_service/mserv00/spectrometer/__pycache__/__init__.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/__pycache__/admin.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/__pycache__/apps.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/__pycache__/engine.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/__pycache__/interfaces.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/__pycache__/models.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/__pycache__/serializers.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/__pycache__/urls.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/__pycache__/views.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0001_initial.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0002_measurement_data_channel_data.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0003_remove_channel_data_measurement_data.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0004_state_engine.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0005_remove_state_engine_measurement_info_engine.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0006_channel_data_measurement_data_and_more.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/migrations/__pycache__/0007_adc_params_averaging_measurement_data_averaging_num.cpython-313.pyc


BIN
spectrometer_service/mserv00/spectrometer/migrations/__pycache__/__init__.cpython-313.pyc