mirror of
https://github.com/dyiop/astute.git
synced 2025-04-05 13:00:16 -04:00
Add files via upload
Initial commit for Astute Web Services and MySQL Database Schema and sample data
This commit is contained in:
gopi17701
GitHub
parent
f6e3683d40
commit
a7b382b236
BIN
AstuteSystem/ProjectPlan.xlsx
Normal file
BIN
AstuteSystem/ProjectPlan.xlsx
Normal file
Binary file not shown.
86
AstuteSystem/astutesystem.iml
Normal file
86
AstuteSystem/astutesystem.iml
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="web" name="Web">
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
|
||||
</descriptors>
|
||||
<webroots>
|
||||
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
|
||||
</webroots>
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-jetty-servlet:2.22.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet:2.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-jetty-http:2.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.hk2.external:javax.inject:2.4.0-b09" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.1.1.v20140108" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.1.1.v20140108" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.1.1.v20140108" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:9.1.1.v20140108" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.1.1.v20140108" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.1.1.v20140108" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.1.1.v20140108" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.1.1.v20140108" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.1.1.v20140108" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jersey.bundles.repackaged:jersey-guava:2.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-api:2.4.0-b09" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-utils:2.4.0-b09" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b09" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-locator:2.4.0-b09" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-server:2.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-jaxb:2.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:6.0.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jgrapht:jgrapht-core:1.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-multipart:2.17" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jvnet.mimepull:mimepull:1.9.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.4.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.4.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.4.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.4.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.4.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: joda-time:joda-time:2.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.swagger:swagger-jersey2-jaxrs:1.5.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.swagger:swagger-jaxrs:1.5.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.4.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.4.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.2.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.reflections:reflections:0.9.9" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:15.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet-core:2.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
6
AstuteSystem/db.config
Normal file
6
AstuteSystem/db.config
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
database=sql
|
||||
host=localhost
|
||||
port=3306
|
||||
username=root
|
||||
password=password
|
||||
schema=astute
|
||||
2
AstuteSystem/deployAstuteWar.bat
Normal file
2
AstuteSystem/deployAstuteWar.bat
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
mvn install
|
||||
mvn tomcat7:deploy
|
||||
10
AstuteSystem/hours.txt
Normal file
10
AstuteSystem/hours.txt
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
Date-Desc-hours-Who
|
||||
1. 1/22/18=Kick off meating-1 hr-Gopi-Akash
|
||||
2. 1/24/18-Design meeting-1.5 hrs-Gopi
|
||||
3. 1/25/18-DB Design-2 hrs-Gopi
|
||||
4. 1/26/18-DB Design-3 hrs-Gopi
|
||||
5. 1/27/18-DB Design meeting-1 hr-Gopi
|
||||
6. 1/28/18-Web sevices design- 1hr - Gopi-Akash
|
||||
7. 1/28/18-Web services development - 2 hrs - Gopi
|
||||
8. 2/2/18-Web services development - 6 hrs - Gopi
|
||||
9. 2/3/18-Web services development - 2 hrs - Gopi
|
||||
18
AstuteSystem/package.json
Normal file
18
AstuteSystem/package.json
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"name": "astutesystem",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"description": "",
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "",
|
||||
"main": "app.js",
|
||||
"dependencies": {
|
||||
"connect": "^3.3.5",
|
||||
"swagger-connect": "^0.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"should": "^7.1.0",
|
||||
"supertest": "^1.0.0"
|
||||
}
|
||||
}
|
||||
132
AstuteSystem/pom.xml
Normal file
132
AstuteSystem/pom.xml
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>com.astute</groupId>
|
||||
<artifactId>astutesystem</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<name>astutesystem</name>
|
||||
|
||||
<build>
|
||||
<finalName>astutesystem</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.5.1</version>
|
||||
<inherited>true</inherited>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.tomcat.maven</groupId>
|
||||
<artifactId>tomcat7-maven-plugin</artifactId>
|
||||
<version>2.2</version>
|
||||
<configuration>
|
||||
<url>http://localhost:8080/manager/text</url>
|
||||
<server>TomcatServer</server>
|
||||
<path>/astutesystem</path>
|
||||
<username>admin</username>
|
||||
<password>password</password>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey</groupId>
|
||||
<artifactId>jersey-bom</artifactId>
|
||||
<version>${jersey.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
|
||||
<dependency>
|
||||
<groupId>commons-io</groupId>
|
||||
<artifactId>commons-io</artifactId>
|
||||
<version>2.6</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
|
||||
<dependency>
|
||||
<groupId>commons-fileupload</groupId>
|
||||
<artifactId>commons-fileupload</artifactId>
|
||||
<version>1.3.3</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.containers</groupId>
|
||||
<artifactId>jersey-container-jetty-servlet</artifactId>
|
||||
<version>2.22.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
<version>2.8.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>6.0.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.12</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jgrapht</groupId>
|
||||
<artifactId>jgrapht-core</artifactId>
|
||||
<version>1.0.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.media</groupId>
|
||||
<artifactId>jersey-media-multipart</artifactId>
|
||||
<version>2.17</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
<version>2.4.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
||||
<version>2.4.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||
<artifactId>jackson-datatype-joda</artifactId>
|
||||
<version>2.4.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.swagger</groupId>
|
||||
<artifactId>swagger-jersey2-jaxrs</artifactId>
|
||||
<version>1.5.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.jsqlparser</groupId>
|
||||
<artifactId>jsqlparser</artifactId>
|
||||
<version>0.9</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<properties>
|
||||
<jersey.version>2.16</jersey.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
</project>
|
||||
410
AstuteSystem/sql/astute.sql
Normal file
410
AstuteSystem/sql/astute.sql
Normal file
|
|
@ -0,0 +1,410 @@
|
|||
-- --------------------------------------------------------
|
||||
-- Host: 127.0.0.1
|
||||
-- Server version: 5.7.12-log - MySQL Community Server (GPL)
|
||||
-- Server OS: Win64
|
||||
-- HeidiSQL Version: 9.4.0.5125
|
||||
-- --------------------------------------------------------
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET NAMES utf8 */;
|
||||
/*!50503 SET NAMES utf8mb4 */;
|
||||
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
|
||||
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
||||
|
||||
|
||||
-- Dumping database structure for astute
|
||||
DROP DATABASE IF EXISTS `astute`;
|
||||
CREATE DATABASE IF NOT EXISTS `astute` /*!40100 DEFAULT CHARACTER SET utf8 */;
|
||||
USE `astute`;
|
||||
|
||||
-- Dumping structure for table astute.change_order
|
||||
CREATE TABLE IF NOT EXISTS `change_order` (
|
||||
`PO_num` varchar(20) NOT NULL,
|
||||
`change_order_num` int(20) NOT NULL,
|
||||
`change_order_date` date DEFAULT NULL,
|
||||
`change_order_amt` double NOT NULL,
|
||||
`description` varchar(500) DEFAULT NULL,
|
||||
PRIMARY KEY (`PO_num`,`change_order_num`),
|
||||
CONSTRAINT `fk_PO_CO_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.change_order: ~0 rows (approximately)
|
||||
/*!40000 ALTER TABLE `change_order` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `change_order` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for function astute.create_customer_fun
|
||||
DELIMITER //
|
||||
CREATE DEFINER=`root`@`localhost` FUNCTION `create_customer_fun`(customerName varchar(100), billToDept varchar(100), add1In varchar(100), add2In varchar(100), cityIn varchar(50), stateIn varchar(20), zipIn int(5), zipLast4In int(4), emailIn varchar(50), phoneIn int(10), faxIn int(10)) RETURNS int(11)
|
||||
BEGIN
|
||||
DECLARE last_inserted_id int(11);
|
||||
INSERT INTO customer (customer_name, bill_to_dept, add1, add2, city, state ,zip, zip_last_4, email, phone, fax)
|
||||
VALUES (customerName, billToDept, add1In, add2In, cityIn, stateIn, zipIn, ziplast4In, emailIn, phoneIn, faxIn);
|
||||
SELECT LAST_INSERT_ID() into last_inserted_id;
|
||||
return last_inserted_id;
|
||||
END//
|
||||
DELIMITER ;
|
||||
|
||||
-- Dumping structure for procedure astute.create_invoice
|
||||
DELIMITER //
|
||||
CREATE DEFINER=`root`@`localhost` PROCEDURE `create_invoice`(invNo varchar(20),invDate date,PONo varchar(20),changeOrderNum varchar(20),paymentStatus int,billAmt double,specialNotes varchar(500), certClause Varchar(500),pmtReceivedDate date)
|
||||
BEGIN
|
||||
INSERT INTO invoice (inv_no,inv_date,PO_num,change_order_num,pmt_status,bill_amt,special_notes,certifcation,pmt_received_date)
|
||||
VALUES (invNo, invDate, PONo, changeOrderNum, paymentStatus, billAmt, specialNotes, certClause, pmtReceivedDate);
|
||||
END//
|
||||
DELIMITER ;
|
||||
|
||||
-- Dumping structure for procedure astute.create_invoice_detail
|
||||
DELIMITER //
|
||||
CREATE DEFINER=`root`@`localhost` PROCEDURE `create_invoice_detail`(invoiceNum varchar(20), lineItemNum int, POLineItemNum varchar(20), serviceTypeId int, description varchar(500), percentCompletion double, hours double, amount double)
|
||||
BEGIN
|
||||
INSERT INTO INVOICE_DETAIL (inv_num, line_item_num, PO_line_item_num, service_type_id, description, percent_completion, hours,amt)
|
||||
VALUES (invoiceNum, lineItemNum, POLineItemNum, serviceTypeId, description, percentCompletion, hours, amount);
|
||||
END//
|
||||
DELIMITER ;
|
||||
|
||||
-- Dumping structure for procedure astute.create_po
|
||||
DELIMITER //
|
||||
CREATE DEFINER=`root`@`localhost` PROCEDURE `create_po`(PONum varchar(40), contractNum varchar(20), PODate date, contractAmt double(10,2), customerid int)
|
||||
BEGIN
|
||||
INSERT INTO PO (PO_num, contract_num, PO_date, contract_amt, customer_id)
|
||||
VALUES (PONum, contractNum, PODate, contractAmt, customerId);
|
||||
END//
|
||||
DELIMITER ;
|
||||
|
||||
-- Dumping structure for procedure astute.create_po_detail
|
||||
DELIMITER //
|
||||
CREATE DEFINER=`root`@`localhost` PROCEDURE `create_po_detail`(PONum varchar(40), lineItemNo int, servicedesc varchar(500), feetypeid int(11), quantity double, servicetypeid int(1), schedule_in varchar(20), deliverby date)
|
||||
BEGIN
|
||||
INSERT INTO PO_DETAIL (PO_num,line_item_no,service_desc,fee_type_id,qty,service_type_id,schedule,deliver_by)
|
||||
VALUES (POnum,lineitemno,servicedesc,feetypeid,quantity,servicetypeid,schedule_in,deliverby);
|
||||
END//
|
||||
DELIMITER ;
|
||||
|
||||
-- Dumping structure for table astute.customer
|
||||
CREATE TABLE IF NOT EXISTS `customer` (
|
||||
`customer_id` int(5) NOT NULL AUTO_INCREMENT,
|
||||
`customer_name` varchar(100) DEFAULT NULL,
|
||||
`bill_to_dept` varchar(50) DEFAULT NULL,
|
||||
`add1` varchar(50) DEFAULT NULL,
|
||||
`add2` varchar(50) DEFAULT NULL,
|
||||
`city` varchar(50) DEFAULT NULL,
|
||||
`state` varchar(2) DEFAULT NULL,
|
||||
`zip` int(5) DEFAULT NULL,
|
||||
`zip_last_4` int(4) DEFAULT NULL,
|
||||
`email` varchar(50) DEFAULT NULL,
|
||||
`phone` bigint(11) DEFAULT NULL,
|
||||
`fax` int(10) DEFAULT NULL,
|
||||
PRIMARY KEY (`customer_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.customer: ~2 rows (approximately)
|
||||
/*!40000 ALTER TABLE `customer` DISABLE KEYS */;
|
||||
INSERT INTO `customer` (`customer_id`, `customer_name`, `bill_to_dept`, `add1`, `add2`, `city`, `state`, `zip`, `zip_last_4`, `email`, `phone`, `fax`) VALUES
|
||||
(1, 'test1233', 'test123', 'test123', 'null', 'test123', 'md', 20874, 0, 'null', 0, 0),
|
||||
(2, 'test123', 'test123', 'test123', NULL, 'test123', 'md', 20874, 0, NULL, 0, 0);
|
||||
/*!40000 ALTER TABLE `customer` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.fee_type
|
||||
CREATE TABLE IF NOT EXISTS `fee_type` (
|
||||
`fee_type_id` int(11) NOT NULL,
|
||||
`fee_type_desc` varchar(40) NOT NULL,
|
||||
PRIMARY KEY (`fee_type_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.fee_type: ~2 rows (approximately)
|
||||
/*!40000 ALTER TABLE `fee_type` DISABLE KEYS */;
|
||||
INSERT INTO `fee_type` (`fee_type_id`, `fee_type_desc`) VALUES
|
||||
(1, 'Fixed fee'),
|
||||
(2, 'Hourly');
|
||||
/*!40000 ALTER TABLE `fee_type` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for function astute.generate_inv_number
|
||||
DELIMITER //
|
||||
CREATE DEFINER=`root`@`localhost` FUNCTION `generate_inv_number`(po_num_in varchar(20)) RETURNS varchar(20) CHARSET utf8
|
||||
BEGIN
|
||||
DECLARE customer_id_in int;
|
||||
DECLARE customer_code varchar(4);
|
||||
DECLARE po_count int;
|
||||
DECLARE inv_count int;
|
||||
DECLARE inv_number varchar(20);
|
||||
|
||||
SELECT customer_id
|
||||
INTO customer_id_in
|
||||
FROM po
|
||||
WHERE po.po_num = po_num_in;
|
||||
|
||||
SELECT substr(customer.customer_name, 1, 4)
|
||||
INTO customer_code
|
||||
FROM customer
|
||||
WHERE customer_id = customer_id_in;
|
||||
|
||||
SELECT count(*)
|
||||
INTO po_count
|
||||
FROM po
|
||||
WHERE customer_id = customer_id_in;
|
||||
|
||||
SELECT count(*)
|
||||
INTO inv_count
|
||||
FROM invoice
|
||||
WHERE invoice.PO_num in (SELECT po_num FROM po WHERE po.customer_id = customer_id_in);
|
||||
SELECT concat(customer_code, '-',LPAD(po_count, 2, '0'), '_',date_format(now(),'%y'), date_format(now(),'%m'), '_', LPAD(inv_count, 2, '0')) INTO inv_number;
|
||||
RETURN inv_number;
|
||||
|
||||
END//
|
||||
DELIMITER ;
|
||||
|
||||
-- Dumping structure for function astute.get_previously_billed_amt
|
||||
DELIMITER //
|
||||
CREATE DEFINER=`root`@`localhost` FUNCTION `get_previously_billed_amt`(po_no varchar(20)) RETURNS double(10,2)
|
||||
BEGIN
|
||||
declare billed_amt double(10,2);
|
||||
SELECT sum(bill_amt) INTO billed_amt FROM invoice WHERE invoice.PO_num = po_no;
|
||||
return billed_amt;
|
||||
END//
|
||||
DELIMITER ;
|
||||
|
||||
-- Dumping structure for function astute.get_remaining_qty_fun
|
||||
DELIMITER //
|
||||
CREATE DEFINER=`root`@`localhost` FUNCTION `get_remaining_qty_fun`(po_num_in varchar(20), item_no_in int) RETURNS double
|
||||
BEGIN
|
||||
DECLARE remaining_qty double;
|
||||
select po_detail.qty - sum(amt) into remaining_qty from invoice_detail, po_detail
|
||||
where invoice_detail.inv_num in (select inv_num from invoice where invoice.PO_num = po_num_in)
|
||||
and invoice_detail.line_item_num = item_no_in
|
||||
and invoice_detail.line_item_num = po_detail.line_item_no;
|
||||
return remaining_qty;
|
||||
END//
|
||||
DELIMITER ;
|
||||
|
||||
-- Dumping structure for table astute.invoice
|
||||
CREATE TABLE IF NOT EXISTS `invoice` (
|
||||
`inv_no` varchar(20) NOT NULL,
|
||||
`inv_date` date NOT NULL,
|
||||
`PO_num` varchar(40) NOT NULL,
|
||||
`change_order_num` varchar(20) DEFAULT NULL,
|
||||
`bill_amt` double NOT NULL,
|
||||
`special_notes` varchar(500) DEFAULT NULL,
|
||||
`certification` varchar(500) DEFAULT 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned.',
|
||||
`inv_status` int(2) DEFAULT '1',
|
||||
`pmt_status` int(11) NOT NULL DEFAULT '1',
|
||||
PRIMARY KEY (`inv_no`),
|
||||
KEY `fk_InvMaster_POnum` (`PO_num`),
|
||||
CONSTRAINT `fk_InvMaster_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.invoice: ~2 rows (approximately)
|
||||
/*!40000 ALTER TABLE `invoice` DISABLE KEYS */;
|
||||
INSERT INTO `invoice` (`inv_no`, `inv_date`, `PO_num`, `change_order_num`, `bill_amt`, `special_notes`, `certification`, `inv_status`, `pmt_status`) VALUES
|
||||
('123', '2018-01-01', 'EP2649247', 'test', 5000, 'asdf', 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned.', 1, 1),
|
||||
('NVCC-01_1712_21', '2017-12-28', 'EP2649247', NULL, 16854, '1. Completion of Phase 1 - Preliminaries\r\n2. Invoice not submitted to NVCC. For submitted invoice, see Excel copy\r\n', 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned.', 1, 1);
|
||||
/*!40000 ALTER TABLE `invoice` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.invoice_detail
|
||||
CREATE TABLE IF NOT EXISTS `invoice_detail` (
|
||||
`inv_num` varchar(20) NOT NULL,
|
||||
`line_item_num` int(11) NOT NULL,
|
||||
`PO_line_item_num` int(11) DEFAULT NULL,
|
||||
`service_type_id` int(11) DEFAULT NULL,
|
||||
`description` varchar(500) DEFAULT NULL,
|
||||
`percent_completion` double DEFAULT NULL,
|
||||
`hours` double DEFAULT NULL,
|
||||
`amt` double DEFAULT NULL,
|
||||
`fee_type_id` int(11) DEFAULT NULL,
|
||||
PRIMARY KEY (`inv_num`,`line_item_num`),
|
||||
KEY `fk_InvDetail_FeeType` (`fee_type_id`),
|
||||
CONSTRAINT `fk_InvDetail_FeeType` FOREIGN KEY (`fee_type_id`) REFERENCES `fee_type` (`fee_type_id`),
|
||||
CONSTRAINT `fk_InvDetail_InvNum` FOREIGN KEY (`inv_num`) REFERENCES `invoice` (`inv_no`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.invoice_detail: ~7 rows (approximately)
|
||||
/*!40000 ALTER TABLE `invoice_detail` DISABLE KEYS */;
|
||||
INSERT INTO `invoice_detail` (`inv_num`, `line_item_num`, `PO_line_item_num`, `service_type_id`, `description`, `percent_completion`, `hours`, `amt`, `fee_type_id`) VALUES
|
||||
('123', 1, NULL, 1, 'tese', 100, 34543, 345435, 1),
|
||||
('NVCC-01_1712_21', 1, 1, NULL, 'test', NULL, NULL, 14953, 1),
|
||||
('NVCC-01_1712_21', 2, 3, NULL, 'Additional Services: Third Party Utility Verification', NULL, NULL, 1500, 1),
|
||||
('NVCC-01_1712_21', 3, 3, NULL, 'Additional Services: Field Investigatoin Travel', NULL, NULL, 321, 1),
|
||||
('NVCC-01_1712_21', 4, 4, NULL, 'Reimbursable Expense: Printing and parking', NULL, NULL, 80, 1),
|
||||
('NVCC-01_1712_21', 10, 1, 0, 'Design Phase Service _Prelimanary', 0, 0, 14953, 1),
|
||||
('NVCC-01_1712_21', 11, 1, 0, 'Design Phase Service _Prelimanary', 0, 0, 14953, 1);
|
||||
/*!40000 ALTER TABLE `invoice_detail` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.invoice_notes
|
||||
CREATE TABLE IF NOT EXISTS `invoice_notes` (
|
||||
`inv_no` varchar(20) NOT NULL,
|
||||
`inv_note` varchar(500) NOT NULL,
|
||||
PRIMARY KEY (`inv_no`),
|
||||
CONSTRAINT `fk_inv_notes_inv_no` FOREIGN KEY (`inv_no`) REFERENCES `invoice` (`inv_no`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.invoice_notes: ~0 rows (approximately)
|
||||
/*!40000 ALTER TABLE `invoice_notes` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `invoice_notes` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.invoice_payment
|
||||
CREATE TABLE IF NOT EXISTS `invoice_payment` (
|
||||
`inv_no` varchar(20) NOT NULL,
|
||||
`invoice_payment_type` int(11) NOT NULL,
|
||||
`invoice_amount` double NOT NULL,
|
||||
`payment_date` date NOT NULL,
|
||||
PRIMARY KEY (`inv_no`),
|
||||
KEY `fk_pinv_pmt_type` (`invoice_payment_type`),
|
||||
CONSTRAINT `fk_inv_pmt_inv_no` FOREIGN KEY (`inv_no`) REFERENCES `invoice` (`inv_no`),
|
||||
CONSTRAINT `fk_pinv_pmt_type` FOREIGN KEY (`invoice_payment_type`) REFERENCES `payment_type` (`payment_type_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.invoice_payment: ~0 rows (approximately)
|
||||
/*!40000 ALTER TABLE `invoice_payment` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `invoice_payment` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.invoice_status
|
||||
CREATE TABLE IF NOT EXISTS `invoice_status` (
|
||||
`inv_status_id` int(11) NOT NULL,
|
||||
`inv_status_desc` varchar(20) NOT NULL,
|
||||
PRIMARY KEY (`inv_status_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.invoice_status: ~3 rows (approximately)
|
||||
/*!40000 ALTER TABLE `invoice_status` DISABLE KEYS */;
|
||||
INSERT INTO `invoice_status` (`inv_status_id`, `inv_status_desc`) VALUES
|
||||
(1, 'Draft'),
|
||||
(2, 'Submitted'),
|
||||
(3, 'Void');
|
||||
/*!40000 ALTER TABLE `invoice_status` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.payment_status
|
||||
CREATE TABLE IF NOT EXISTS `payment_status` (
|
||||
`payment_status_id` int(11) NOT NULL,
|
||||
`payment_status_desc` varchar(20) NOT NULL,
|
||||
PRIMARY KEY (`payment_status_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.payment_status: ~3 rows (approximately)
|
||||
/*!40000 ALTER TABLE `payment_status` DISABLE KEYS */;
|
||||
INSERT INTO `payment_status` (`payment_status_id`, `payment_status_desc`) VALUES
|
||||
(1, 'Outstanding'),
|
||||
(2, 'Partially paid'),
|
||||
(3, 'Paid');
|
||||
/*!40000 ALTER TABLE `payment_status` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.payment_type
|
||||
CREATE TABLE IF NOT EXISTS `payment_type` (
|
||||
`payment_type_id` int(11) NOT NULL,
|
||||
`payment_type_name` varchar(20) NOT NULL,
|
||||
PRIMARY KEY (`payment_type_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.payment_type: ~3 rows (approximately)
|
||||
/*!40000 ALTER TABLE `payment_type` DISABLE KEYS */;
|
||||
INSERT INTO `payment_type` (`payment_type_id`, `payment_type_name`) VALUES
|
||||
(1, 'Credit Card'),
|
||||
(2, 'Check'),
|
||||
(3, 'ACH');
|
||||
/*!40000 ALTER TABLE `payment_type` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.po
|
||||
CREATE TABLE IF NOT EXISTS `po` (
|
||||
`PO_num` varchar(40) NOT NULL COMMENT 'Alpha numeric, auto generated in frontend',
|
||||
`contract_num` varchar(20) DEFAULT NULL,
|
||||
`PO_date` date DEFAULT NULL,
|
||||
`contract_amt` double(10,2) DEFAULT NULL,
|
||||
`customer_id` int(11) NOT NULL,
|
||||
PRIMARY KEY (`PO_num`),
|
||||
KEY `ind_pomaster_contractno` (`contract_num`),
|
||||
KEY `ind_pomaster_podate` (`PO_date`),
|
||||
KEY `po_customer_id` (`customer_id`),
|
||||
CONSTRAINT `po_customer_id` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.po: ~1 rows (approximately)
|
||||
/*!40000 ALTER TABLE `po` DISABLE KEYS */;
|
||||
INSERT INTO `po` (`PO_num`, `contract_num`, `PO_date`, `contract_amt`, `customer_id`) VALUES
|
||||
('EP2649247', 'TEST123', '2017-10-13', 30000.00, 1);
|
||||
/*!40000 ALTER TABLE `po` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.po_detail
|
||||
CREATE TABLE IF NOT EXISTS `po_detail` (
|
||||
`PO_num` varchar(40) NOT NULL,
|
||||
`line_item_no` int(11) NOT NULL,
|
||||
`service_desc` varchar(500) DEFAULT NULL,
|
||||
`fee_type_id` int(11) DEFAULT '1' COMMENT '1-fixed fee, 2-hourly',
|
||||
`qty` double DEFAULT NULL,
|
||||
`service_type_id` int(1) DEFAULT '1' COMMENT '1-studies, 2-supplemental service, 3-out of pocket, 4-reimbursement, 5-',
|
||||
`schedule` varchar(20) DEFAULT NULL,
|
||||
`deliver_by` date DEFAULT NULL,
|
||||
PRIMARY KEY (`PO_num`,`line_item_no`),
|
||||
KEY `fk_PODetail_ServType` (`service_type_id`),
|
||||
CONSTRAINT `fk_PODetail_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`),
|
||||
CONSTRAINT `fk_PODetail_ServType` FOREIGN KEY (`service_type_id`) REFERENCES `service_type` (`service_type_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.po_detail: ~5 rows (approximately)
|
||||
/*!40000 ALTER TABLE `po_detail` DISABLE KEYS */;
|
||||
INSERT INTO `po_detail` (`PO_num`, `line_item_no`, `service_desc`, `fee_type_id`, `qty`, `service_type_id`, `schedule`, `deliver_by`) VALUES
|
||||
('EP2649247', 1, 'test', 2, 38073, 1, NULL, NULL),
|
||||
('EP2649247', 2, 'test', 2, 16345, 1, NULL, NULL),
|
||||
('EP2649247', 3, 'test', 2, 4642, 2, NULL, NULL),
|
||||
('EP2649247', 4, 'test', 2, 880, 4, NULL, NULL),
|
||||
('EP2649247', 6, 'test', 2, 456, 1, 'dfgr', NULL);
|
||||
/*!40000 ALTER TABLE `po_detail` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.service_type
|
||||
CREATE TABLE IF NOT EXISTS `service_type` (
|
||||
`service_type_id` int(11) NOT NULL,
|
||||
`desc` varchar(40) NOT NULL,
|
||||
PRIMARY KEY (`service_type_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.service_type: ~5 rows (approximately)
|
||||
/*!40000 ALTER TABLE `service_type` DISABLE KEYS */;
|
||||
INSERT INTO `service_type` (`service_type_id`, `desc`) VALUES
|
||||
(1, 'study'),
|
||||
(2, 'design'),
|
||||
(3, 'Peer review'),
|
||||
(4, 'cost estimation'),
|
||||
(5, 'forensic investigation');
|
||||
/*!40000 ALTER TABLE `service_type` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.session
|
||||
CREATE TABLE IF NOT EXISTS `session` (
|
||||
`session_id` varchar(500) NOT NULL,
|
||||
`user_id` int(11) NOT NULL,
|
||||
`session_start_date` date DEFAULT NULL,
|
||||
`session_end_date` date DEFAULT NULL,
|
||||
PRIMARY KEY (`session_id`),
|
||||
KEY `fk_session_user_id` (`user_id`),
|
||||
CONSTRAINT `fk_session_user_id` FOREIGN KEY (`user_id`) REFERENCES `user` (`user_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.session: ~3 rows (approximately)
|
||||
/*!40000 ALTER TABLE `session` DISABLE KEYS */;
|
||||
INSERT INTO `session` (`session_id`, `user_id`, `session_start_date`, `session_end_date`) VALUES
|
||||
('745de7a0e6c1480398ca36116512bc06', 1, NULL, NULL),
|
||||
('985874e08cb74fa08419f8883f3eeff7', 1, NULL, NULL),
|
||||
('a4b6bde153004b7ba17220f5ba2bb323', 1, NULL, NULL);
|
||||
/*!40000 ALTER TABLE `session` ENABLE KEYS */;
|
||||
|
||||
-- Dumping structure for table astute.user
|
||||
CREATE TABLE IF NOT EXISTS `user` (
|
||||
`user_id` int(5) NOT NULL,
|
||||
`username` varchar(20) DEFAULT NULL,
|
||||
`password` varchar(20) DEFAULT NULL,
|
||||
`first_name` varchar(20) DEFAULT NULL,
|
||||
`middle_name` varchar(20) DEFAULT NULL,
|
||||
`last_name` varchar(20) DEFAULT NULL,
|
||||
`role` varchar(20) DEFAULT NULL,
|
||||
`email` varchar(40) DEFAULT NULL,
|
||||
`office_phone_ext` int(3) DEFAULT NULL,
|
||||
`cell_phone` bigint(20) DEFAULT NULL,
|
||||
PRIMARY KEY (`user_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- Dumping data for table astute.user: ~2 rows (approximately)
|
||||
/*!40000 ALTER TABLE `user` DISABLE KEYS */;
|
||||
INSERT INTO `user` (`user_id`, `username`, `password`, `first_name`, `middle_name`, `last_name`, `role`, `email`, `office_phone_ext`, `cell_phone`) VALUES
|
||||
(1, 'sparikh', 'sparikh', 'Saurin', NULL, 'Parikh', 'Owner', 'sparikh@Astuteng.com', 2024002004, 3014616485),
|
||||
(2, 'humarethiya', 'humarethiya', 'Haresh', NULL, 'Umaretiya', 'Owner', 'Humaretiya@astuteng.com', 2024002004, 0);
|
||||
/*!40000 ALTER TABLE `user` ENABLE KEYS */;
|
||||
|
||||
/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
|
||||
/*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */;
|
||||
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
package com.astute.common;
|
||||
|
||||
public class Constants {
|
||||
//error codes
|
||||
//web services
|
||||
|
||||
public static final int ERR_CONFIGURATION = 6014;
|
||||
public static final int SUCCESS = 9000;
|
||||
}
|
||||
29
AstuteSystem/src/main/java/com/astute/common/Utility.java
Normal file
29
AstuteSystem/src/main/java/com/astute/common/Utility.java
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
package com.astute.common;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
||||
/**
|
||||
* Created by Gopi on 9/7/2017.
|
||||
*/
|
||||
public class Utility {
|
||||
public Utility() {
|
||||
}
|
||||
|
||||
public static String setToString(HashSet<String> inValue, String separator){
|
||||
String values = "";
|
||||
for(String value : inValue) {
|
||||
values += value + separator;
|
||||
}
|
||||
values = values.substring(0, values.length()-1);
|
||||
return values;
|
||||
}
|
||||
|
||||
public static String arrayToString(String[] inValue, String separator){
|
||||
String values = "";
|
||||
for(String value : inValue) {
|
||||
values += value + separator;
|
||||
}
|
||||
values = values.substring(0, values.length()-1);
|
||||
return values;
|
||||
}
|
||||
}
|
||||
148
AstuteSystem/src/main/java/com/astute/dao/DAO.java
Normal file
148
AstuteSystem/src/main/java/com/astute/dao/DAO.java
Normal file
|
|
@ -0,0 +1,148 @@
|
|||
package com.astute.dao;
|
||||
|
||||
import com.astute.exceptions.AstuteException;
|
||||
import com.astute.exceptions.AstuteException;
|
||||
import com.astute.model.*;
|
||||
|
||||
import java.io.*;
|
||||
import java.sql.*;
|
||||
import java.sql.Date;
|
||||
import java.util.*;
|
||||
|
||||
public abstract class DAO {
|
||||
public static DAO dao;
|
||||
|
||||
static String database;
|
||||
static String host;
|
||||
static int port;
|
||||
static String username;
|
||||
static String password;
|
||||
static String schema;
|
||||
static int interval = 30;
|
||||
|
||||
/**
|
||||
* @return The static instance of the DaoHelper
|
||||
*/
|
||||
public static DAO getDao() throws AstuteException {
|
||||
if (dao == null) {
|
||||
throw new AstuteException(0,"Review db.config file.");
|
||||
}
|
||||
return dao;
|
||||
}
|
||||
|
||||
public static String getDatabase() {
|
||||
return database;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method is called from the StartupServlet, with the properties being read from pm.conf
|
||||
*
|
||||
* @param
|
||||
* @throws AstuteException
|
||||
*/
|
||||
public static void init() throws AstuteException {
|
||||
try {
|
||||
File configDir = new File(System.getProperty("catalina.base"), "conf");
|
||||
File configFile = new File(configDir, "db.config");
|
||||
InputStream stream = new FileInputStream(configFile);
|
||||
Properties props = new Properties();
|
||||
props.load(stream);
|
||||
|
||||
// Properties props = new Properties();
|
||||
// InputStream input = new FileInputStream("db.config");
|
||||
|
||||
// load a properties file
|
||||
// props.load(input);
|
||||
|
||||
//get properties
|
||||
database = props.getProperty("database");
|
||||
host = props.getProperty("host");
|
||||
port = Integer.parseInt(props.getProperty("port"));
|
||||
schema = props.getProperty("schema");
|
||||
username = props.getProperty("username");
|
||||
password = props.getProperty("password");
|
||||
System.out.println("=============================================");
|
||||
System.out.println("host is " + host);
|
||||
System.out.println("port is " + port);
|
||||
System.out.println("schema is " + schema);
|
||||
System.out.println("username is " + username);
|
||||
System.out.println("password is " + password);
|
||||
System.out.println("=============================================");
|
||||
dao = new SqlDAO();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public Connection conn;
|
||||
|
||||
public DAO() throws AstuteException {
|
||||
//connect to database
|
||||
connect();
|
||||
}
|
||||
|
||||
/**
|
||||
* Abstract method to establish a connection to the database
|
||||
*
|
||||
* @throws AstuteException if the database is not running or if there are any other connection issues
|
||||
*/
|
||||
public abstract void connect() throws AstuteException;
|
||||
|
||||
public abstract List<PO> getPOMaster(String PONum, String contractNum, java.sql.Date PODate) throws AstuteException;
|
||||
|
||||
public abstract List<PODetail> getPODetail(String PONum, int lineItemNo) throws AstuteException;
|
||||
|
||||
public abstract void updatePOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt) throws AstuteException;
|
||||
|
||||
public abstract void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, java.sql.Date deiverBy) throws AstuteException;
|
||||
|
||||
public abstract void createPOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt, int customerId) throws AstuteException;
|
||||
|
||||
public abstract void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, java.sql.Date deiverBy) throws AstuteException;
|
||||
|
||||
|
||||
public abstract List<Invoice> getInvoiceMaster(String invoiceNumber, int pmtStatus) throws AstuteException;
|
||||
|
||||
public abstract List<InvoiceDetail> getInvoiceDetail(String invoiceNum, int lineItemNo) throws AstuteException;
|
||||
|
||||
public abstract void updateInvoiceMaster(String invoiceNum, java.sql.Date invoiceDate, String PONum, String changeOrderNum, int pmtStatus, Double billAmt, String specialNotes, String certification) throws AstuteException;
|
||||
|
||||
public abstract void updateInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double amount) throws AstuteException;
|
||||
|
||||
public abstract void createInvoiceMaster(String invoiceNum, java.sql.Date invoiceDate, String PONum, String changeOrderNum, int pmtStatus, Double billAmt, String specialNotes, String certification) throws AstuteException;
|
||||
|
||||
public abstract void createInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double amount) throws AstuteException;
|
||||
|
||||
public abstract String generateInvoiceNumber(String poNum) throws AstuteException;
|
||||
|
||||
public abstract GeneratedInvoice getGeneratedInvoice(String invoiceNumber)throws AstuteException;
|
||||
|
||||
|
||||
public abstract List<Customer> getCustomers(int customerId) throws AstuteException;
|
||||
|
||||
public abstract int createCustomer(String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) throws AstuteException;
|
||||
|
||||
public abstract void updateCustomer(int customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) throws AstuteException;
|
||||
|
||||
// User and session method implementation
|
||||
|
||||
public abstract ResultSet executeQuery(String sessionId, String sql) throws AstuteException ;
|
||||
|
||||
public abstract User getUser(String username) throws AstuteException ;
|
||||
|
||||
public abstract void createSession(int userId, String sessionId) throws AstuteException;
|
||||
|
||||
public abstract void deleteSession(String sessionId);
|
||||
|
||||
public abstract String getSessionUsername(String sessionId) throws AstuteException;
|
||||
|
||||
public abstract String login(String username, String password) throws AstuteException;
|
||||
|
||||
public abstract List<ChangeOrder> getChangeOrders(String poNum) throws AstuteException;
|
||||
|
||||
public abstract void updateChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException;
|
||||
|
||||
public abstract int createChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException;
|
||||
|
||||
|
||||
}
|
||||
839
AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
Normal file
839
AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
Normal file
|
|
@ -0,0 +1,839 @@
|
|||
package com.astute.dao;
|
||||
|
||||
import com.astute.exceptions.AstuteException;
|
||||
import com.astute.exceptions.AstuteException;
|
||||
|
||||
import com.astute.model.*;
|
||||
|
||||
import javax.crypto.SecretKeyFactory;
|
||||
import javax.crypto.spec.PBEKeySpec;
|
||||
import java.math.BigInteger;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.SecureRandom;
|
||||
import java.security.spec.InvalidKeySpecException;
|
||||
import java.sql.*;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import static com.astute.exceptions.AstuteException.DB_ERROR;
|
||||
|
||||
public class SqlDAO extends DAO {
|
||||
|
||||
public SqlDAO() throws AstuteException {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void connect() throws AstuteException {
|
||||
try {
|
||||
Class.forName("com.mysql.cj.jdbc.Driver");
|
||||
conn = DriverManager.getConnection("jdbc:mysql://" + host + ":" + port + "/" + schema, username, password);
|
||||
System.out.println("Connected to MySQL");
|
||||
} catch (Exception e) {
|
||||
throw new AstuteException(e.hashCode(), e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public List<PO> getPOMaster(String PONum, String contractNum, Date PODate) throws AstuteException {
|
||||
try {
|
||||
List<PO> pos = new ArrayList<>();
|
||||
Statement stmt = conn.createStatement();
|
||||
String sql = "SELECT PO_num, contract_num, PO_date, customer_id, contract_amt FROM PO ";
|
||||
if (PONum != null) {
|
||||
sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'";
|
||||
} else if (contractNum != null) {
|
||||
sql += "WHERE UPPER(contract_num) = '" + contractNum.toUpperCase()+ "'";
|
||||
} else if (PODate != null) {
|
||||
sql += "WHERE PO_date = STR_TO_DATE(" + PODate + ", '%Y-%m-%d')";
|
||||
}
|
||||
|
||||
ResultSet rs = stmt.executeQuery(sql);
|
||||
while (rs.next()) {
|
||||
String poNum = rs.getString(1);
|
||||
String cntrctNum = rs.getString(2);
|
||||
Date poDate = rs.getDate(3);
|
||||
Integer customerId = rs.getInt(4);
|
||||
Double contractAmt = rs.getDouble(5);
|
||||
PO po = new PO(poNum, cntrctNum, poDate, customerId, contractAmt);
|
||||
pos.add(po);
|
||||
}
|
||||
return pos;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public List<PODetail> getPODetail(String PONum, int lineItemNo) throws AstuteException {
|
||||
try {
|
||||
List<PODetail> poDetails = new ArrayList<>();
|
||||
Statement stmt = conn.createStatement();
|
||||
String whereClause = " WHERE ";
|
||||
boolean whereClauseCriteria = false;
|
||||
String sql = "SELECT PO_num, line_item_no, service_desc, fee_type_id, qty, service_type_id, get_remaining_qty(PO_num, line_item_no) as get_remaining_qty FROM PO_DETAIL ";
|
||||
if (PONum != null) {
|
||||
whereClause = whereClause + " UPPER(PO_num) = '" + PONum.toUpperCase() + "'";
|
||||
whereClauseCriteria = true;
|
||||
}
|
||||
if (lineItemNo > 0) {
|
||||
if (whereClauseCriteria) {
|
||||
whereClause += " AND ";
|
||||
}
|
||||
whereClause = whereClause + " line_item_no = " + lineItemNo;
|
||||
}
|
||||
sql += whereClause;
|
||||
System.out.println(sql);
|
||||
ResultSet rs = stmt.executeQuery(sql);
|
||||
while (rs.next()) {
|
||||
String poNum = rs.getString(1);
|
||||
int lineItemNum = rs.getInt(2);
|
||||
String serviceDesc = rs.getString(3);
|
||||
int feeTypeId = rs.getInt(4);
|
||||
Double qty = rs.getDouble(5);
|
||||
int serviceTypeId = rs.getInt(6);
|
||||
double remainingQty = rs.getInt(7);
|
||||
PODetail poDetail = new PODetail(poNum, lineItemNum, serviceDesc, feeTypeId, qty, serviceTypeId, remainingQty);
|
||||
poDetails.add(poDetail);
|
||||
}
|
||||
return poDetails;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void updatePOMaster(String PONum, String contractNum, Date PODate, Double contractAmt) throws AstuteException {
|
||||
try {
|
||||
String sql = "UPDATE PO ";
|
||||
String updateClause = " SET ";
|
||||
String whereClause = "";
|
||||
if (PONum == null || PONum.isEmpty()) {
|
||||
throw new AstuteException(0, "PO Number null.");
|
||||
} else {
|
||||
whereClause = " WHERE UPPER(PO_num) ='" + PONum.toUpperCase() + "'";
|
||||
}
|
||||
|
||||
if (contractNum != null && !contractNum.isEmpty()) {
|
||||
updateClause = updateClause + " contract_num = '" + contractNum.toUpperCase() + "',";
|
||||
}
|
||||
if (PODate != null) {
|
||||
updateClause = updateClause + " PO_Date = STR_TO_DATE(" + PODate + ", '%Y-%m-%d')" + ",";
|
||||
}
|
||||
if (contractAmt != null && contractAmt > 0) {
|
||||
updateClause = updateClause + " contract_amt = " + contractAmt;
|
||||
}
|
||||
if (!updateClause.equalsIgnoreCase(" SET ")) {
|
||||
sql = sql + trimLastCharacter(updateClause, ",") + whereClause;
|
||||
|
||||
} else {
|
||||
System.out.println(updateClause);
|
||||
throw new AstuteException(0, "No values to update.");
|
||||
}
|
||||
System.out.println(sql);
|
||||
Statement stmt = conn.createStatement();
|
||||
stmt.executeUpdate(sql);
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public String trimLastCharacter(String sql, String character) {
|
||||
sql = sql.trim();
|
||||
if (sql.endsWith(character)) {
|
||||
sql = sql.substring(0, sql.length() - 1);
|
||||
}
|
||||
return sql;
|
||||
|
||||
}
|
||||
|
||||
public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, Date deiverBy) throws AstuteException {
|
||||
try {
|
||||
String sql = "UPDATE PO_DETAIL ";
|
||||
String updateClause = " SET ";
|
||||
String whereClause = " WHERE UPPER(PO_num) = '" + POnum.toUpperCase() + "' AND line_item_no = " + lineItemNo;
|
||||
if (POnum == null || POnum.isEmpty() || lineItemNo < 0) {
|
||||
throw new AstuteException(0, "PO Number should not be null and line item number must be greater than 0.");
|
||||
} else {
|
||||
whereClause = " WHERE UPPER(PO_num) = '" + POnum.toUpperCase() + "' AND line_item_no = " + lineItemNo;
|
||||
}
|
||||
if (lineItemNo < 0) {
|
||||
throw new AstuteException(0, "Line item Number must be greater than 0.");
|
||||
}
|
||||
if (serviceDesc != null && !serviceDesc.isEmpty()) {
|
||||
updateClause += " service_desc = '" + serviceDesc + "',";
|
||||
}
|
||||
if (feeTypeId > 0) {
|
||||
updateClause += " fee_type_id = " + feeTypeId + ",";
|
||||
}
|
||||
if (qty != null && qty > 0) {
|
||||
updateClause += " qty = " + qty + ",";
|
||||
}
|
||||
if (serviceTypeId > 0) {
|
||||
updateClause += " service_type_id = " + serviceTypeId + ",";
|
||||
}
|
||||
if (schedule != null && !schedule.isEmpty()) {
|
||||
updateClause += " schedule = '" + schedule + "',";
|
||||
}
|
||||
if (deiverBy != null) {
|
||||
updateClause += " deiver_by = " + deiverBy;
|
||||
}
|
||||
|
||||
if (!updateClause.equalsIgnoreCase(" SET ")) {
|
||||
sql = sql + trimLastCharacter(updateClause, ",") + whereClause;
|
||||
|
||||
} else {
|
||||
throw new AstuteException(0, "No values to update.");
|
||||
}
|
||||
System.out.println(sql);
|
||||
Statement stmt = conn.createStatement();
|
||||
stmt.executeUpdate(sql);
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void createPOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, int customerId) throws AstuteException {
|
||||
try {
|
||||
System.out.println("Calling create_PO Procedure");
|
||||
System.out.println("PONum is " + PONum);
|
||||
CallableStatement stmt = conn.prepareCall("{call create_PO(?,?,?,?)}");
|
||||
stmt.setString(1, PONum);
|
||||
stmt.setString(2, contractNum);
|
||||
stmt.setDate(3, PODate);
|
||||
stmt.setDouble(4, contractAmt);
|
||||
stmt.setInt(5, customerId);
|
||||
stmt.executeUpdate();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, Date deiverBy) throws AstuteException {
|
||||
try {
|
||||
System.out.println("Calling create_po_detail Procedure");
|
||||
System.out.println("POnum is " + POnum);
|
||||
CallableStatement stmt = conn.prepareCall("{call create_po_detail(?,?,?,?,?,?,?,?)}");
|
||||
stmt.setString(1, POnum);
|
||||
stmt.setInt(2, lineItemNo);
|
||||
stmt.setString(3, serviceDesc);
|
||||
stmt.setInt(4, feeTypeId);
|
||||
stmt.setDouble(5, qty);
|
||||
stmt.setInt(6, serviceTypeId);
|
||||
stmt.setString(7, schedule);
|
||||
stmt.setDate(8, deiverBy);
|
||||
stmt.executeUpdate();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public Double getPreviouslyBilledAmount(String poNum) throws AstuteException {
|
||||
try {
|
||||
Double billedAmt = new Double(0);
|
||||
Statement stmt = conn.createStatement();
|
||||
String sql = "SELECT sum(bill_amt) FROM invoice WHERE invoice.PO_num = '" + poNum + "'";
|
||||
ResultSet rs = stmt.executeQuery(sql);
|
||||
while (rs.next()) {
|
||||
billedAmt = rs.getDouble(1);
|
||||
}
|
||||
return billedAmt;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public String generateInvoiceNumber(String poNum) throws AstuteException {
|
||||
try {
|
||||
String generatedInvoiceNumber;
|
||||
System.out.println("Calling generate_inv_number DB function");
|
||||
System.out.println("poNum is " + poNum);
|
||||
CallableStatement stmt = conn.prepareCall("{? = call generate_inv_number(?)}");
|
||||
stmt.registerOutParameter(1, Types.VARCHAR);
|
||||
|
||||
stmt.setString(2, poNum);
|
||||
stmt.execute();
|
||||
generatedInvoiceNumber = stmt.getString(1);
|
||||
return generatedInvoiceNumber;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
public GeneratedInvoice getGeneratedInvoice(String invoiceNumber) throws AstuteException{
|
||||
GeneratedInvoice generatedInvoice = null;
|
||||
Invoice invoice = getInvoiceMaster(invoiceNumber, 0).get(0);
|
||||
String PONo = invoice.getPoNum();
|
||||
List<InvoiceDetail> invoiceDetail = getInvoiceDetail(invoiceNumber, 0);
|
||||
PO po = getPOMaster(PONo, null, null).get(0);
|
||||
Integer customerId = po.getCustomerId();
|
||||
Customer customer = getCustomers(customerId).get(0);
|
||||
Double previouslyBilledAmt = getPreviouslyBilledAmount(PONo);
|
||||
Double toBeBilledAmt = po.getContractAmt() - previouslyBilledAmt - invoice.getBillAmt();
|
||||
generatedInvoice = new GeneratedInvoice(invoice, invoiceDetail, po, customer, previouslyBilledAmt, toBeBilledAmt );
|
||||
return generatedInvoice;
|
||||
}
|
||||
|
||||
|
||||
public List<Invoice> getInvoiceMaster(String invoiceNumber, int pmtStatus)throws AstuteException {
|
||||
try {
|
||||
List<Invoice> invoices = new ArrayList<>();
|
||||
Statement stmt = conn.createStatement();
|
||||
String whereClause = " WHERE ";
|
||||
boolean whereClauseIndicator = false;
|
||||
String sql = "SELECT inv_no, inv_date, PO_num, change_order_num, pmt_status, bill_amt, special_notes, certification FROM INVOICE ";
|
||||
if (invoiceNumber != null) {
|
||||
whereClause = whereClause + " UPPER(inv_no) = '"+ invoiceNumber.toUpperCase() +"'";
|
||||
whereClauseIndicator = true;
|
||||
}
|
||||
if (pmtStatus > 0) {
|
||||
if (whereClauseIndicator) {
|
||||
whereClause += " AND ";
|
||||
}
|
||||
whereClause = whereClause + " pmt_status = "+ pmtStatus;
|
||||
}
|
||||
if (!whereClause.equals(" WHERE ")) {
|
||||
|
||||
sql += whereClause;
|
||||
}
|
||||
System.out.println(sql);
|
||||
ResultSet rs = stmt.executeQuery(sql);
|
||||
while (rs.next()) {
|
||||
String invNo = rs.getString(1);
|
||||
Date invdDate = rs.getDate(2);
|
||||
String PONo = rs.getString(3);
|
||||
String changeOrderNum = rs.getString(4);
|
||||
int paymentStatus = rs.getInt(5);
|
||||
Double billAmt = rs.getDouble(6);
|
||||
String specialNotes = rs.getString(7);
|
||||
String certification = rs.getString(8);
|
||||
Invoice invoice = new Invoice(invNo, invdDate, PONo, changeOrderNum, paymentStatus, billAmt, specialNotes, certification);
|
||||
invoices.add(invoice);
|
||||
}
|
||||
return invoices;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public List<InvoiceDetail> getInvoiceDetail(String invoiceNum, int lineItemNo)throws AstuteException {
|
||||
try {
|
||||
List<InvoiceDetail> services = new ArrayList<>();
|
||||
Statement stmt = conn.createStatement();
|
||||
String sql = "SELECT inv_num, line_item_num, PO_line_item_num, service_type_id, description, percent_completion, hours,amt FROM INVOICE_DETAIL ";
|
||||
|
||||
String whereClause = " WHERE ";
|
||||
boolean whereClauseIndicator = false;
|
||||
if (invoiceNum != null) {
|
||||
whereClause = whereClause + " UPPER(inv_num) = '"+ invoiceNum.toUpperCase() +"'";
|
||||
whereClauseIndicator = true;
|
||||
}
|
||||
if (lineItemNo > 0) {
|
||||
if (whereClauseIndicator) {
|
||||
whereClause += " AND ";
|
||||
}
|
||||
whereClause = whereClause + " line_item_num = "+ lineItemNo;
|
||||
}
|
||||
|
||||
sql += whereClause;
|
||||
ResultSet rs = stmt.executeQuery(sql);
|
||||
while (rs.next()) {
|
||||
String invNo = rs.getString(1);
|
||||
int lineItemNum = rs.getInt(2);
|
||||
int POLineItemNum = rs.getInt(3);
|
||||
int serviceTypeId = rs.getInt(4);
|
||||
String desc = rs.getString(5);
|
||||
Double percentCompletion = rs.getDouble(6);
|
||||
Double hours = rs.getDouble(7);
|
||||
Double amount = rs.getDouble(8);
|
||||
InvoiceDetail service = new InvoiceDetail(invNo, lineItemNum, POLineItemNum, serviceTypeId, desc, percentCompletion, hours, amount);
|
||||
services.add(service);
|
||||
}
|
||||
return services;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void updateInvoiceMaster(String invoiceNum, Date invoiceDate, String PONum, String changeOrderNum, int pmtStatus, Double billAmt, String specialNotes, String certification)throws AstuteException {
|
||||
try {
|
||||
String sql = "UPDATE INVOICE ";
|
||||
String updateClause = " SET ";
|
||||
String whereClause = "";
|
||||
if (invoiceNum == null || invoiceNum.isEmpty()) {
|
||||
throw new AstuteException(0, "Invoice Number can't be null.");
|
||||
} else {
|
||||
whereClause = " WHERE UPPER(inv_no) ='" + invoiceNum.toUpperCase() + "'";
|
||||
}
|
||||
|
||||
if (invoiceDate != null ) {
|
||||
updateClause = updateClause + " inv_date = " + invoiceDate + ",";
|
||||
}
|
||||
if (PONum == null || PONum.isEmpty()) {
|
||||
updateClause = updateClause + " PO_num = '" + PONum + "',";
|
||||
}
|
||||
if (changeOrderNum == null || changeOrderNum.isEmpty()) {
|
||||
updateClause = updateClause + " change_order_num = '" + changeOrderNum + "',";
|
||||
}
|
||||
if (pmtStatus > 0 ) {
|
||||
updateClause = updateClause + " pmt_status = " + pmtStatus + ",";
|
||||
}
|
||||
if (billAmt > 0) {
|
||||
updateClause = updateClause + " bill_amt = " + billAmt + ",";
|
||||
}
|
||||
if (specialNotes == null || specialNotes.isEmpty()) {
|
||||
updateClause = updateClause + " special_notes = '" + specialNotes + "',";
|
||||
}
|
||||
if (certification == null || certification.isEmpty()) {
|
||||
updateClause = updateClause + " certification = '" + certification + "',";
|
||||
}
|
||||
|
||||
if (!updateClause.equalsIgnoreCase(" SET ")) {
|
||||
sql = sql + trimLastCharacter(updateClause,",") + whereClause;
|
||||
|
||||
} else {
|
||||
System.out.println(updateClause);
|
||||
throw new AstuteException(0, "No values to update.");
|
||||
}
|
||||
System.out.println(sql);
|
||||
Statement stmt = conn.createStatement();
|
||||
stmt.executeUpdate(sql);
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void updateInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double amount)throws AstuteException {
|
||||
try {
|
||||
String sql = "UPDATE INVOICE_DETAIL ";
|
||||
String updateClause = " SET ";
|
||||
String whereClause = "";
|
||||
if(invoiceNum == null || invoiceNum.isEmpty() || lineItemNum < 0) {
|
||||
throw new AstuteException(0, "PO Number should not be null and line item number must be greater than 0.");
|
||||
} else {
|
||||
whereClause = " WHERE UPPER(inv_num) = '" + invoiceNum.toUpperCase() + "' AND line_item_num = " + lineItemNum;
|
||||
}
|
||||
if(POLineItemNum >0) {
|
||||
updateClause += " PO_line_item_num = " + POLineItemNum + ",";
|
||||
}
|
||||
if(serviceTypeId >0) {
|
||||
updateClause += " service_type_id = " + serviceTypeId + ",";
|
||||
}
|
||||
if(desc != null && !desc.isEmpty()) {
|
||||
updateClause += " description = '" + desc + "',";
|
||||
}
|
||||
if(percentCompletion >0) {
|
||||
updateClause += " percent_completion = " + percentCompletion + ",";
|
||||
}
|
||||
if(hours > 0) {
|
||||
updateClause += " hours = " + hours + ",";
|
||||
}
|
||||
if(amount >0) {
|
||||
updateClause += " amt = " + amount + ",";
|
||||
}
|
||||
|
||||
if (!updateClause.equalsIgnoreCase(" SET ")) {
|
||||
sql = sql + trimLastCharacter(updateClause,",") + whereClause;
|
||||
|
||||
} else {
|
||||
throw new AstuteException(0, "No values to update.");
|
||||
}
|
||||
System.out.println(sql);
|
||||
Statement stmt = conn.createStatement();
|
||||
stmt.executeUpdate(sql);
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
public void createInvoiceMaster(String invoiceNum, Date invoiceDate, String PONum, String changeOrderNum, int pmtStatus, Double billAmt, String specialNotes, String certification)throws AstuteException {
|
||||
try {
|
||||
System.out.println("Calling create_invoice Procedure");
|
||||
System.out.println("invoiceNum is "+invoiceNum);
|
||||
CallableStatement stmt = conn.prepareCall("{call create_invoice(?,?,?,?,?,?,?,?,?)}");
|
||||
stmt.setString(1, invoiceNum);
|
||||
stmt.setDate(2, invoiceDate);
|
||||
stmt.setString(3, PONum);
|
||||
stmt.setString(4, changeOrderNum);
|
||||
stmt.setInt(5, pmtStatus);
|
||||
stmt.setDouble(6, billAmt);
|
||||
stmt.setString(7, specialNotes);
|
||||
stmt.setString(8, certification);
|
||||
stmt.executeUpdate();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void createInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double amount)throws AstuteException {
|
||||
try {
|
||||
System.out.println("Calling create_invoice_detail Procedure");
|
||||
System.out.println("invoiceNum is "+invoiceNum);
|
||||
CallableStatement stmt = conn.prepareCall("{call create_invoice_detail(?,?,?,?,?,?,?,?)}");
|
||||
stmt.setString(1, invoiceNum);
|
||||
stmt.setInt(2, lineItemNum);
|
||||
stmt.setInt(3, POLineItemNum);
|
||||
stmt.setInt(4, serviceTypeId);
|
||||
stmt.setString(5, desc);
|
||||
stmt.setDouble(6, percentCompletion);
|
||||
stmt.setDouble(7, hours);
|
||||
stmt.setDouble(8, amount);
|
||||
stmt.executeUpdate();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public List<Customer> getCustomers(int customerId) throws AstuteException {
|
||||
try {
|
||||
List<Customer> customers = new ArrayList<>();
|
||||
Statement stmt = conn.createStatement();
|
||||
String sql = "SELECT customer_id, customer_name, bill_to_dept, add1, add2, city, state ,zip, zip_last_4, email, phone, fax FROM customer ";
|
||||
if (customerId > 0) {
|
||||
sql += " WHERE customer_id = " + customerId;
|
||||
}
|
||||
ResultSet rs = stmt.executeQuery(sql);
|
||||
while (rs.next()) {
|
||||
int customerID = rs.getInt(1);
|
||||
String customerName = rs.getString(2);
|
||||
String billToDept = rs.getString(3);
|
||||
String add1 = rs.getString(4);
|
||||
String add2 = rs.getString(5);
|
||||
String city = rs.getString(6);
|
||||
String state = rs.getString(7);
|
||||
int zip = rs.getInt(8);
|
||||
int ziplast4 = rs.getInt(9);
|
||||
String email = rs.getString(10);
|
||||
int phone = rs.getInt(11);
|
||||
int fax = rs.getInt(12);
|
||||
Customer customer = new Customer(customerID, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax);
|
||||
customers.add(customer);
|
||||
}
|
||||
return customers;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public int createCustomer(String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) throws AstuteException {
|
||||
try {
|
||||
CallableStatement stmt = conn.prepareCall("{? = call create_customer_fun(?,?,?,?,?,?,?,?,?,?,?,?)}");
|
||||
stmt.registerOutParameter(1, Types.INTEGER);
|
||||
stmt.setString(2, customerName);
|
||||
stmt.setString(3, billToDept);
|
||||
stmt.setString(4, add1);
|
||||
stmt.setString(5, add2);
|
||||
stmt.setString(6, city);
|
||||
stmt.setString(7, state);
|
||||
stmt.setInt(8, zip);
|
||||
stmt.setInt(9, ziplast4);
|
||||
stmt.setString(10, email);
|
||||
stmt.setInt(11, phone);
|
||||
stmt.setInt(12, fax);
|
||||
stmt.executeUpdate();
|
||||
int customerId = stmt.getInt(1);
|
||||
return customerId;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
public void updateCustomer( int customerId, String customerName, String billToDept, String add1, String
|
||||
add2, String city, String state, int zip, int ziplast4, String email,int phone, int fax) throws
|
||||
AstuteException {
|
||||
try {
|
||||
String sql = "UPDATE CUSTOMER ";
|
||||
String updateClause = " SET ";
|
||||
String whereClause = "";
|
||||
if (customerId <= 0) {
|
||||
throw new AstuteException(0, "CustomerId can't be null.");
|
||||
} else {
|
||||
whereClause = " WHERE customer_id =" + customerId;
|
||||
}
|
||||
|
||||
// if (customerName != null && !customerName.isEmpty()) {
|
||||
updateClause = updateClause + " customer_name = '" + customerName + "',";
|
||||
// }
|
||||
// if (billToDept != null && !billToDept.isEmpty()) {
|
||||
updateClause = updateClause + " bill_to_dept = '" + billToDept + "',";
|
||||
// }
|
||||
// if (add1 != null && !add1.isEmpty()) {
|
||||
updateClause = updateClause + " add1 = '" + add1 + "',";
|
||||
// }
|
||||
// if (add2 != null && !add2.isEmpty()) {
|
||||
updateClause = updateClause + " add2 = '" + add2 + "',";
|
||||
// }
|
||||
// if (city != null || city.isEmpty()) {
|
||||
updateClause = updateClause + " city = '" + city + "',";
|
||||
// }
|
||||
// if (state == null || state.isEmpty()) {
|
||||
updateClause = updateClause + " state = '" + state + "',";
|
||||
// }
|
||||
// if (zip > 0) {
|
||||
updateClause = updateClause + " zip = " + zip + ",";
|
||||
// }
|
||||
// if (ziplast4 > 0) {
|
||||
updateClause = updateClause + " zip_last_4 = " + ziplast4 + ",";
|
||||
// }
|
||||
// if (email == null || email.isEmpty()) {
|
||||
updateClause = updateClause + " email = '" + email + "',";
|
||||
// }
|
||||
// if (phone > 0) {
|
||||
updateClause = updateClause + " phone = " + phone + ",";
|
||||
// }
|
||||
// if (fax > 0) {
|
||||
updateClause = updateClause + " fax = " + fax + ",";
|
||||
// }
|
||||
if (!updateClause.equalsIgnoreCase(" SET ")) {
|
||||
sql = sql + trimLastCharacter(updateClause, ",") + whereClause;
|
||||
|
||||
} else {
|
||||
System.out.println(updateClause);
|
||||
throw new AstuteException(0, "No values to update.");
|
||||
}
|
||||
System.out.println(sql);
|
||||
Statement stmt = conn.createStatement();
|
||||
stmt.executeUpdate(sql);
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
// user and session methods
|
||||
public ResultSet executeQuery(String sessionId, String sql) throws AstuteException {
|
||||
String username = getSessionUsername(sessionId);
|
||||
|
||||
Statement stmt = null;
|
||||
try {
|
||||
stmt = conn.createStatement();
|
||||
return stmt.executeQuery("/*user=" + username + "*/ " + sql);
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public User getUser(String username) throws AstuteException {
|
||||
String sql = "select user_id, username, password from user where username='" + username + "'";
|
||||
|
||||
try {
|
||||
Statement stmt = conn.createStatement();
|
||||
ResultSet resultSet = stmt.executeQuery(sql);
|
||||
|
||||
User user = null;
|
||||
if(resultSet.next()) {
|
||||
user = new User(resultSet.getInt(1), resultSet.getString(2), resultSet.getString(3));
|
||||
}
|
||||
// conn.close();
|
||||
|
||||
return user;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void createSession(int userId, String sessionId) throws AstuteException {
|
||||
try {
|
||||
String sql = "insert into session (user_id, session_id) values (" + userId + ", '" + sessionId + "')";
|
||||
|
||||
Statement stmt = conn.createStatement();
|
||||
stmt.execute(sql);
|
||||
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void deleteSession(String sessionId) {
|
||||
}
|
||||
|
||||
public String getSessionUsername(String sessionId) throws AstuteException {
|
||||
try {
|
||||
String sql = "select username from users join sessions on users.user_id = sessions.user_id where sessions.session_id = '" + sessionId + "'";
|
||||
|
||||
Statement stmt = conn.createStatement();
|
||||
ResultSet resultSet = stmt.executeQuery(sql);
|
||||
resultSet.next();
|
||||
String sessionUserName = resultSet.getString(1);
|
||||
|
||||
conn.close();
|
||||
|
||||
return sessionUserName;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public List<ChangeOrder> getChangeOrders(String poNum) throws AstuteException {
|
||||
try {
|
||||
List<ChangeOrder> changeOrders = new ArrayList<ChangeOrder>();
|
||||
Statement stmt = conn.createStatement();
|
||||
String sql = "SELECT PO_num, change_order_num, change_order_date, change_order_amt, description FROM change_order; ";
|
||||
if (poNum != null) {
|
||||
sql += " WHERE po_num = '" + poNum + "'";
|
||||
}
|
||||
ResultSet rs = stmt.executeQuery(sql);
|
||||
while (rs.next()) {
|
||||
String PONum = rs.getString(1);
|
||||
int changeOrderNum = rs.getInt(2);
|
||||
Date changeOrderDate = rs.getDate(3);
|
||||
Double changeOrderAmt = rs.getDouble(4);
|
||||
String description = rs.getString(5);
|
||||
ChangeOrder changeOrder = new ChangeOrder(changeOrderNum, PONum, changeOrderDate, changeOrderAmt, description);
|
||||
changeOrders.add(changeOrder);
|
||||
}
|
||||
return changeOrders;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
};
|
||||
|
||||
public void updateChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException {
|
||||
try {
|
||||
String sql = "UPDATE CHANGE_ORDER ";
|
||||
String updateClause = " SET ";
|
||||
String whereClause = "";
|
||||
if (poNum == null || poNum.isEmpty() || changeOrderNum <=0 ) {
|
||||
throw new AstuteException(DB_ERROR,"PO Number can't be null and Change Order Number should be a positive number! ");
|
||||
} else {
|
||||
whereClause = " WHERE UPPER(PO_num) ='" + poNum.toUpperCase() + "' and change_order_num = " + changeOrderNum;
|
||||
}
|
||||
|
||||
updateClause = updateClause + " changeOrderAmt = " + changeOrderAmt ;
|
||||
if (changeOrderDate != null) {
|
||||
updateClause = updateClause + ", changeOrderDate = STR_TO_DATE(" + changeOrderDate + ", '%Y-%m-%d')" + ",";
|
||||
}
|
||||
if (description != null) {
|
||||
updateClause = updateClause + ", description = '" + description + "'";
|
||||
}
|
||||
sql = sql + updateClause + whereClause;
|
||||
System.out.println(sql);
|
||||
Statement stmt = conn.createStatement();
|
||||
stmt.executeUpdate(sql);
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public int createChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException{
|
||||
try {
|
||||
String dateString = "STR_TO_DATE(" + changeOrderDate + ", '%Y-%m-%d')";
|
||||
String sql = "insert into change_order (po_num, change_order_num, change_order_amt, change_order_date, description) values ('" + poNum + "', " + changeOrderNum + ", " + changeOrderAmt + ", " + dateString + ", '" + description + "')";
|
||||
Statement stmt = conn.createStatement();
|
||||
stmt.execute(sql);
|
||||
return changeOrderNum;
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
throw new AstuteException(DB_ERROR,e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public String login(String username, String password) throws AstuteException{
|
||||
User user = dao.getUser(username);
|
||||
boolean check = false;
|
||||
if (password.equals(user.getPassword())) {
|
||||
check = true;
|
||||
}
|
||||
// try {
|
||||
// check = checkPasswordHash(user.getPassword(), password);
|
||||
// } catch (NoSuchAlgorithmException e) {
|
||||
//
|
||||
// } catch (InvalidKeySpecException e) {
|
||||
//
|
||||
// }
|
||||
if(check) {
|
||||
//create session
|
||||
String sessionId = UUID.randomUUID().toString().replaceAll("-", "");
|
||||
|
||||
dao.createSession(user.getUserId(), sessionId);
|
||||
|
||||
return sessionId;
|
||||
}else{
|
||||
return null; //"Username or password was not correct";
|
||||
}
|
||||
}
|
||||
|
||||
private String generatePasswordHash(String password) throws InvalidKeySpecException, NoSuchAlgorithmException {
|
||||
int iterations = 100;
|
||||
char[] chars = password.toCharArray();
|
||||
SecureRandom sr = SecureRandom.getInstance("SHA1PRNG");
|
||||
byte[] salt = new byte[16];
|
||||
sr.nextBytes(salt);
|
||||
|
||||
PBEKeySpec spec = new PBEKeySpec(chars, salt, iterations, 64 * 8);
|
||||
SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
|
||||
byte[] hash = skf.generateSecret(spec).getEncoded();
|
||||
return iterations /*+ PM_FIELD_DELIM*/ + toHex(salt) + /*PM_FIELD_DELIM +*/ toHex(hash);
|
||||
}
|
||||
|
||||
private boolean checkPasswordHash(String stored, String toCheck) throws NoSuchAlgorithmException, InvalidKeySpecException{
|
||||
String part0 = stored.substring(0, 3);
|
||||
String part1 = stored.substring(3, 35);
|
||||
String part2 = stored.substring(35);
|
||||
//String[] parts = stored.split(PM_FIELD_DELIM);
|
||||
int iterations = Integer.parseInt(part0);
|
||||
byte[] salt = fromHex(part1);
|
||||
byte[] hash = fromHex(part2);
|
||||
|
||||
PBEKeySpec spec = new PBEKeySpec(toCheck.toCharArray(), salt, iterations, hash.length * 8);
|
||||
SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
|
||||
byte[] testHash = skf.generateSecret(spec).getEncoded();
|
||||
|
||||
String x = toHex(testHash);
|
||||
|
||||
int diff = hash.length ^ testHash.length;
|
||||
for(int i = 0; i < hash.length && i < testHash.length; i++)
|
||||
{
|
||||
diff |= hash[i] ^ testHash[i];
|
||||
if(hash[i] != testHash[i]){
|
||||
int cx = 0;
|
||||
}
|
||||
}
|
||||
return diff == 0;
|
||||
}
|
||||
|
||||
private static byte[] fromHex(String hex) throws NoSuchAlgorithmException
|
||||
{
|
||||
byte[] bytes = new byte[hex.length() / 2];
|
||||
for(int i = 0; i<bytes.length ;i++)
|
||||
{
|
||||
bytes[i] = (byte)Integer.parseInt(hex.substring(2 * i, 2 * i + 2), 16);
|
||||
}
|
||||
return bytes;
|
||||
}
|
||||
|
||||
private static String toHex(byte[] array) throws NoSuchAlgorithmException
|
||||
{
|
||||
BigInteger bi = new BigInteger(1, array);
|
||||
String hex = bi.toString(16);
|
||||
int paddingLength = (array.length * 2) - hex.length();
|
||||
if(paddingLength > 0)
|
||||
{
|
||||
return String.format("%0" +paddingLength + "d", 0) + hex;
|
||||
}else{
|
||||
return hex;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
package com.astute.exceptions;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
|
||||
@JsonIgnoreProperties(value = {"stackTrace", "cause", "localizedMessage", "suppressed"})
|
||||
public class AstuteException extends Exception {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public static final int SUCCESS = 200;
|
||||
public static final int CLIENT_ERROR = 400;
|
||||
public static final int SERVER_ERROR = 500;
|
||||
public static final int DB_ERROR = 600;
|
||||
|
||||
|
||||
private int code;
|
||||
|
||||
public AstuteException(int code, String msg) {
|
||||
super(msg);
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public int getErrorCode() {
|
||||
return code;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
package com.astute.exceptions;
|
||||
|
||||
public class DatabaseException extends AstuteException {
|
||||
public DatabaseException(int code, String msg) {
|
||||
super(code, msg);
|
||||
}
|
||||
}
|
||||
22
AstuteSystem/src/main/java/com/astute/filter/CORSFilter.java
Normal file
22
AstuteSystem/src/main/java/com/astute/filter/CORSFilter.java
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
package com.astute.filter;
|
||||
|
||||
import javax.ws.rs.container.ContainerRequestContext;
|
||||
import javax.ws.rs.container.ContainerResponseContext;
|
||||
import javax.ws.rs.container.ContainerResponseFilter;
|
||||
import javax.ws.rs.ext.Provider;
|
||||
import java.io.IOException;
|
||||
|
||||
@Provider
|
||||
public class CORSFilter implements ContainerResponseFilter {
|
||||
|
||||
@Override
|
||||
public void filter(ContainerRequestContext request,
|
||||
ContainerResponseContext response) throws IOException {
|
||||
response.getHeaders().add("Access-Control-Allow-Origin", "*");
|
||||
response.getHeaders().add("Access-Control-Allow-Headers",
|
||||
"origin, content-type, accept, authorization");
|
||||
response.getHeaders().add("Access-Control-Allow-Credentials", "true");
|
||||
response.getHeaders().add("Access-Control-Allow-Methods",
|
||||
"GET, POST, PUT, DELETE, OPTIONS, HEAD");
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
package com.astute.helpers;
|
||||
|
||||
public class JsonHelper {
|
||||
|
||||
// public static Node getNodeFromJson(String json){
|
||||
// return new Gson().fromJson(json, Node.class);
|
||||
// }
|
||||
//
|
||||
// public static HashSet<String> getOpsFromJson(String json) {
|
||||
// HashSet<String> ops = new HashSet<>();
|
||||
// String[] opsArr = json.replaceAll("[\\[\\]\"]", "").split(",");
|
||||
// if(!opsArr[0].isEmpty()){
|
||||
// ops.addAll(Arrays.asList(opsArr));
|
||||
// }
|
||||
// return ops;
|
||||
// }
|
||||
//
|
||||
// public static List<Long> toList(String json){
|
||||
// List<Long> ids = new ArrayList<>();
|
||||
// String[] idArr = json.replaceAll("[\\[\\]]", "").split(",");
|
||||
// if(!idArr[0].isEmpty()){
|
||||
// for(String id : idArr) {
|
||||
// ids.add(Long.valueOf(id));
|
||||
// }
|
||||
// }
|
||||
// return ids;
|
||||
// }
|
||||
//
|
||||
// public static Association getAssociationFromJson(String json) {
|
||||
// return new Gson().fromJson(json, Association.class);
|
||||
// }
|
||||
//
|
||||
// public static String toJson(Object o, boolean pretty){
|
||||
// String s = new Gson().toJson(o);
|
||||
// Gson gson;
|
||||
// if(pretty) {
|
||||
// gson = new GsonBuilder().setPrettyPrinting().create();
|
||||
// }else{
|
||||
// gson = new GsonBuilder().create();
|
||||
// }
|
||||
// JsonParser jp = new JsonParser();
|
||||
// JsonElement je = jp.parse(s);
|
||||
// return gson.toJson(je);
|
||||
// }
|
||||
//
|
||||
// public static List<Property> getPropertiesFromJson(String json) {
|
||||
// List<Property> props = new ArrayList<>();
|
||||
// JsonElement je = new JsonParser().parse(json);
|
||||
// JsonObject jo = je.getAsJsonObject();
|
||||
// Set<Map.Entry<String, JsonElement>> entries = jo.entrySet();
|
||||
//
|
||||
// for(Map.Entry<String, JsonElement> prop : entries){
|
||||
// if(prop.getKey().equals("name") || prop.getKey().equals("type") || prop.getKey().equals("id")){
|
||||
// continue;
|
||||
// }
|
||||
// try {
|
||||
// Property property = new Property(prop.getKey(), StringUtils.strip(prop.getValue().toString(), "\""));
|
||||
// props.add(property);
|
||||
// }
|
||||
// catch (InvalidPropertyException e) {
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
// }
|
||||
// return props;
|
||||
// }
|
||||
//
|
||||
// public static ProhibitionSubject getProhibitionSubject(String json) {
|
||||
// return new Gson().fromJson(json, ProhibitionSubject.class);
|
||||
// }
|
||||
//
|
||||
// public static Prohibition getProhibition(String json) {
|
||||
// return new Gson().fromJson(json, Prohibition.class);
|
||||
// }
|
||||
//
|
||||
// public static List<ProhibitionRes> getProhibitionResources(String json) {
|
||||
// json = json.replaceAll("[\\[\\]]", "").replaceAll("\\},\\{", "}|{");
|
||||
// String[] jsonArr = json.split("\\|");
|
||||
// List<ProhibitionRes> drs = new ArrayList<>();
|
||||
// for(String j : jsonArr){
|
||||
// drs.add(new Gson().fromJson(j, ProhibitionRes.class));
|
||||
// }
|
||||
// return drs;
|
||||
// }
|
||||
}
|
||||
59
AstuteSystem/src/main/java/com/astute/model/ChangeOrder.java
Normal file
59
AstuteSystem/src/main/java/com/astute/model/ChangeOrder.java
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
package com.astute.model;
|
||||
|
||||
import java.sql.Date;
|
||||
|
||||
public class ChangeOrder {
|
||||
int changeOrderNum;
|
||||
String poNum;
|
||||
Date changeOrderDate;
|
||||
Double changeOrderAmt;
|
||||
String description;
|
||||
|
||||
public ChangeOrder(int changeOrderNum, String poNum, Date changeOrderDate, Double changeOrderAmt, String description) {
|
||||
this.changeOrderNum = changeOrderNum;
|
||||
this.poNum = poNum;
|
||||
this.changeOrderDate = changeOrderDate;
|
||||
this.changeOrderAmt = changeOrderAmt;
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public int getChangeOrderNum() {
|
||||
return changeOrderNum;
|
||||
}
|
||||
|
||||
public void setChangeOrderNum(int changeOrderNum) {
|
||||
this.changeOrderNum = changeOrderNum;
|
||||
}
|
||||
|
||||
public String getPoNum() {
|
||||
return poNum;
|
||||
}
|
||||
|
||||
public void setPoNum(String poNum) {
|
||||
this.poNum = poNum;
|
||||
}
|
||||
|
||||
public Date getChangeOrderDate() {
|
||||
return changeOrderDate;
|
||||
}
|
||||
|
||||
public void setChangeOrderDate(Date changeOrderDate) {
|
||||
this.changeOrderDate = changeOrderDate;
|
||||
}
|
||||
|
||||
public Double getChangeOrderAmt() {
|
||||
return changeOrderAmt;
|
||||
}
|
||||
|
||||
public void setChangeOrderAmt(Double changeOrderAmt) {
|
||||
this.changeOrderAmt = changeOrderAmt;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
}
|
||||
129
AstuteSystem/src/main/java/com/astute/model/Customer.java
Normal file
129
AstuteSystem/src/main/java/com/astute/model/Customer.java
Normal file
|
|
@ -0,0 +1,129 @@
|
|||
package com.astute.model;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public class Customer {
|
||||
int customerId;
|
||||
String customerName;
|
||||
String billToDept;
|
||||
String add1;
|
||||
String add2;
|
||||
String city;
|
||||
String state;
|
||||
int zip;
|
||||
int ziplast4;
|
||||
String email;
|
||||
int phone;
|
||||
int fax;
|
||||
|
||||
public Customer(int customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) {
|
||||
this.customerId = customerId;
|
||||
this.customerName = customerName;
|
||||
this.billToDept = billToDept;
|
||||
this.add1 = add1;
|
||||
this.add2 = add2;
|
||||
this.city = city;
|
||||
this.state = state;
|
||||
this.zip = zip;
|
||||
this.ziplast4 = ziplast4;
|
||||
this.email = email;
|
||||
this.phone = phone;
|
||||
this.fax = fax;
|
||||
}
|
||||
|
||||
public int getCustomerId() {
|
||||
return customerId;
|
||||
}
|
||||
|
||||
public void setCustomerId(int customerId) {
|
||||
this.customerId = customerId;
|
||||
}
|
||||
|
||||
public String getCustomerName() {
|
||||
return customerName;
|
||||
}
|
||||
|
||||
public void setCustomerName(String customerName) {
|
||||
this.customerName = customerName;
|
||||
}
|
||||
|
||||
public String getBillToDept() {
|
||||
return billToDept;
|
||||
}
|
||||
|
||||
public void setBillToDept(String billToDept) {
|
||||
this.billToDept = billToDept;
|
||||
}
|
||||
|
||||
public String getAdd1() {
|
||||
return add1;
|
||||
}
|
||||
|
||||
public void setAdd1(String add1) {
|
||||
this.add1 = add1;
|
||||
}
|
||||
|
||||
public String getAdd2() {
|
||||
return add2;
|
||||
}
|
||||
|
||||
public void setAdd2(String add2) {
|
||||
this.add2 = add2;
|
||||
}
|
||||
|
||||
public String getCity() {
|
||||
return city;
|
||||
}
|
||||
|
||||
public void setCity(String city) {
|
||||
this.city = city;
|
||||
}
|
||||
|
||||
public String getState() {
|
||||
return state;
|
||||
}
|
||||
|
||||
public void setState(String state) {
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public int getZip() {
|
||||
return zip;
|
||||
}
|
||||
|
||||
public void setZip(int zip) {
|
||||
this.zip = zip;
|
||||
}
|
||||
|
||||
public int getZiplast4() {
|
||||
return ziplast4;
|
||||
}
|
||||
|
||||
public void setZiplast4(int ziplast4) {
|
||||
this.ziplast4 = ziplast4;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public int getPhone() {
|
||||
return phone;
|
||||
}
|
||||
|
||||
public void setPhone(int phone) {
|
||||
this.phone = phone;
|
||||
}
|
||||
|
||||
public int getFax() {
|
||||
return fax;
|
||||
}
|
||||
|
||||
public void setFax(int fax) {
|
||||
this.fax = fax;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
package com.astute.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class GeneratedInvoice {
|
||||
|
||||
Invoice invoice;
|
||||
List<InvoiceDetail> invoiceDetail;
|
||||
PO po;
|
||||
Customer customer;
|
||||
Double previouslyPaidAmt;
|
||||
Double balanceToBeBilled;
|
||||
|
||||
|
||||
public GeneratedInvoice(Invoice invoice, List<InvoiceDetail> invoiceDetail, PO po, Customer customer, Double previouslyPaidAmt, Double balanceToBeBilled) {
|
||||
this.invoice = invoice;
|
||||
this.invoiceDetail = invoiceDetail;
|
||||
this.po = po;
|
||||
this.customer = customer;
|
||||
this.previouslyPaidAmt = previouslyPaidAmt;
|
||||
this.balanceToBeBilled = balanceToBeBilled;
|
||||
}
|
||||
|
||||
public Invoice getInvoice() {
|
||||
return invoice;
|
||||
}
|
||||
|
||||
public void setInvoice(Invoice invoice) {
|
||||
this.invoice = invoice;
|
||||
}
|
||||
|
||||
public List<InvoiceDetail> getInvoiceDetail() {
|
||||
return invoiceDetail;
|
||||
}
|
||||
|
||||
public void setInvoiceDetail(List<InvoiceDetail> invoiceDetail) {
|
||||
this.invoiceDetail = invoiceDetail;
|
||||
}
|
||||
|
||||
public PO getPo() {
|
||||
return po;
|
||||
}
|
||||
|
||||
public void setPo(PO po) {
|
||||
this.po = po;
|
||||
}
|
||||
|
||||
public Customer getCustomer() {
|
||||
return customer;
|
||||
}
|
||||
|
||||
public void setCustomer(Customer customer) {
|
||||
this.customer = customer;
|
||||
}
|
||||
|
||||
public Double getPreviouslyPaidAmt() {
|
||||
return previouslyPaidAmt;
|
||||
}
|
||||
|
||||
public void setPreviouslyPaidAmt(Double previouslyPaidAmt) {
|
||||
this.previouslyPaidAmt = previouslyPaidAmt;
|
||||
}
|
||||
|
||||
public Double getBalanceToBeBilled() {
|
||||
return balanceToBeBilled;
|
||||
}
|
||||
|
||||
public void setBalanceToBeBilled(Double balanceToBeBilled) {
|
||||
this.balanceToBeBilled = balanceToBeBilled;
|
||||
}
|
||||
}
|
||||
91
AstuteSystem/src/main/java/com/astute/model/Invoice.java
Normal file
91
AstuteSystem/src/main/java/com/astute/model/Invoice.java
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
package com.astute.model;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public class Invoice {
|
||||
String invoiceNumber;
|
||||
Date invoiceDate;
|
||||
String poNum;
|
||||
String changeOrderNum;
|
||||
int pmtStatus;
|
||||
Double billAmt;
|
||||
String specialNotes;
|
||||
String certification;
|
||||
|
||||
public Invoice(String invoiceNumber, Date invoiceDate, String poNum, String changeOrderNum, int pmtStatus, Double billAmt, String specialNotes, String certification) {
|
||||
this.invoiceNumber = invoiceNumber;
|
||||
this.invoiceDate = invoiceDate;
|
||||
this.poNum = poNum;
|
||||
this.changeOrderNum = changeOrderNum;
|
||||
this.pmtStatus = pmtStatus;
|
||||
this.billAmt = billAmt;
|
||||
this.specialNotes = specialNotes;
|
||||
this.certification = certification;
|
||||
}
|
||||
|
||||
public String getInvoiceNumber() {
|
||||
|
||||
return invoiceNumber;
|
||||
}
|
||||
|
||||
public void setInvoiceNumber(String invoiceNumber) {
|
||||
this.invoiceNumber = invoiceNumber;
|
||||
}
|
||||
|
||||
public Date getInvoiceDate() {
|
||||
return invoiceDate;
|
||||
}
|
||||
|
||||
public void setInvoiceDate(Date invoiceDate) {
|
||||
this.invoiceDate = invoiceDate;
|
||||
}
|
||||
|
||||
public String getPoNum() {
|
||||
return poNum;
|
||||
}
|
||||
|
||||
public void setPoNum(String poNum) {
|
||||
this.poNum = poNum;
|
||||
}
|
||||
|
||||
public String getChangeOrderNum() {
|
||||
return changeOrderNum;
|
||||
}
|
||||
|
||||
public void setChangeOrderNum(String changeOrderNum) {
|
||||
this.changeOrderNum = changeOrderNum;
|
||||
}
|
||||
|
||||
public int getPmtStatus() {
|
||||
return pmtStatus;
|
||||
}
|
||||
|
||||
public void setPmtStatus(int pmtStatus) {
|
||||
this.pmtStatus = pmtStatus;
|
||||
}
|
||||
|
||||
public Double getBillAmt() {
|
||||
return billAmt;
|
||||
}
|
||||
|
||||
public void setBillAmt(Double billAmt) {
|
||||
this.billAmt = billAmt;
|
||||
}
|
||||
|
||||
public String getSpecialNotes() {
|
||||
return specialNotes;
|
||||
}
|
||||
|
||||
public void setSpecialNotes(String specialNotes) {
|
||||
this.specialNotes = specialNotes;
|
||||
}
|
||||
|
||||
public String getCertification() {
|
||||
return certification;
|
||||
}
|
||||
|
||||
public void setCertification(String certification) {
|
||||
this.certification = certification;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,88 @@
|
|||
package com.astute.model;
|
||||
|
||||
public class InvoiceDetail {
|
||||
String invoiceNum;
|
||||
int lineItemNum;
|
||||
int poLineItemNum;
|
||||
int serviceTypeId;
|
||||
String desc;
|
||||
double percentCompletion;
|
||||
double hours;
|
||||
double anount;
|
||||
public InvoiceDetail(String invoiceNum, int lineItemNum, int poLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double anount) {
|
||||
this.invoiceNum = invoiceNum;
|
||||
this.lineItemNum = lineItemNum;
|
||||
this.poLineItemNum = poLineItemNum;
|
||||
this.serviceTypeId = serviceTypeId;
|
||||
this.desc = desc;
|
||||
this.percentCompletion = percentCompletion;
|
||||
this.hours = hours;
|
||||
this.anount = anount;
|
||||
}
|
||||
|
||||
public String getInvoiceNum() {
|
||||
return invoiceNum;
|
||||
}
|
||||
|
||||
public void setInvoiceNum(String invoiceNum) {
|
||||
this.invoiceNum = invoiceNum;
|
||||
}
|
||||
|
||||
public int getLineItemNum() {
|
||||
return lineItemNum;
|
||||
}
|
||||
|
||||
public void setLineItemNum(int lineItemNum) {
|
||||
this.lineItemNum = lineItemNum;
|
||||
}
|
||||
|
||||
public int getPoLineItemNum() {
|
||||
return poLineItemNum;
|
||||
}
|
||||
|
||||
public void setPoLineItemNum(int poLineItemNum) {
|
||||
this.poLineItemNum = poLineItemNum;
|
||||
}
|
||||
|
||||
public int getServiceTypeId() {
|
||||
return serviceTypeId;
|
||||
}
|
||||
|
||||
public void setServiceTypeId(int serviceTypeId) {
|
||||
this.serviceTypeId = serviceTypeId;
|
||||
}
|
||||
|
||||
public String getDesc() {
|
||||
return desc;
|
||||
}
|
||||
|
||||
public void setDesc(String desc) {
|
||||
this.desc = desc;
|
||||
}
|
||||
|
||||
public double getPercentCompletion() {
|
||||
return percentCompletion;
|
||||
}
|
||||
|
||||
public void setPercentCompletion(double percentCompletion) {
|
||||
this.percentCompletion = percentCompletion;
|
||||
}
|
||||
|
||||
public double getHours() {
|
||||
return hours;
|
||||
}
|
||||
|
||||
public void setHours(double hours) {
|
||||
this.hours = hours;
|
||||
}
|
||||
|
||||
public double getAnount() {
|
||||
return anount;
|
||||
}
|
||||
|
||||
public void setAnount(double anount) {
|
||||
this.anount = anount;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
67
AstuteSystem/src/main/java/com/astute/model/PO.java
Normal file
67
AstuteSystem/src/main/java/com/astute/model/PO.java
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
package com.astute.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
public class PO implements Serializable{
|
||||
|
||||
private String contractNum;
|
||||
private Date PODate;
|
||||
private Double contractAmt;
|
||||
private Integer customerId;
|
||||
|
||||
public PO(String PONum, String contractNum, Date PODate, Integer customerId, Double contractAmt) {
|
||||
this.PONum = PONum;
|
||||
this.contractNum = contractNum;
|
||||
this.PODate = PODate;
|
||||
this.customerId = customerId;
|
||||
this.contractAmt = contractAmt;
|
||||
|
||||
}
|
||||
|
||||
private String PONum;
|
||||
|
||||
public String getPONum() {
|
||||
return PONum;
|
||||
}
|
||||
|
||||
public void setPONum(String PONum) {
|
||||
this.PONum = PONum;
|
||||
}
|
||||
|
||||
public String getContractNum() {
|
||||
return contractNum;
|
||||
}
|
||||
|
||||
public void setContractNum(String contractNum) {
|
||||
this.contractNum = contractNum;
|
||||
}
|
||||
|
||||
public Date getPODate() {
|
||||
return PODate;
|
||||
}
|
||||
|
||||
public void setPODate(Date PODate) {
|
||||
this.PODate = PODate;
|
||||
}
|
||||
|
||||
public Double getContractAmt() {
|
||||
return contractAmt;
|
||||
}
|
||||
|
||||
public void setContractAmt(Double contractAmt) {
|
||||
this.contractAmt = contractAmt;
|
||||
}
|
||||
|
||||
public Integer getCustomerId() {
|
||||
return customerId;
|
||||
}
|
||||
|
||||
public void setCustomerId(Integer customerId) {
|
||||
this.customerId = customerId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
78
AstuteSystem/src/main/java/com/astute/model/PODetail.java
Normal file
78
AstuteSystem/src/main/java/com/astute/model/PODetail.java
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
package com.astute.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
public class PODetail implements Serializable{
|
||||
String POnum;
|
||||
int lineItemNo;
|
||||
String serviceDesc;
|
||||
int feeTypeId;
|
||||
Double qty;
|
||||
int serviceTypeId;
|
||||
Double remainingQty;
|
||||
|
||||
public PODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, Double remainingQty) {
|
||||
this.POnum = POnum;
|
||||
this.lineItemNo = lineItemNo;
|
||||
this.serviceDesc = serviceDesc;
|
||||
this.feeTypeId = feeTypeId;
|
||||
this.qty = qty;
|
||||
this.serviceTypeId = serviceTypeId;
|
||||
this.remainingQty = remainingQty;
|
||||
}
|
||||
|
||||
public String getPOnum() {
|
||||
return POnum;
|
||||
}
|
||||
|
||||
public void setPOnum(String POnum) {
|
||||
this.POnum = POnum;
|
||||
}
|
||||
|
||||
public int getLineItemNo() {
|
||||
return lineItemNo;
|
||||
}
|
||||
|
||||
public void setLineItemNo(int lineItemNo) {
|
||||
this.lineItemNo = lineItemNo;
|
||||
}
|
||||
|
||||
public String getServiceDesc() {
|
||||
return serviceDesc;
|
||||
}
|
||||
|
||||
public void setServiceDesc(String serviceDesc) {
|
||||
this.serviceDesc = serviceDesc;
|
||||
}
|
||||
|
||||
public int getFeeTypeId() {
|
||||
return feeTypeId;
|
||||
}
|
||||
|
||||
public void setFeeTypeId(int feeTypeId) {
|
||||
this.feeTypeId = feeTypeId;
|
||||
}
|
||||
|
||||
public Double getQty() {
|
||||
return qty;
|
||||
}
|
||||
|
||||
public void setQty(Double qty) {
|
||||
this.qty = qty;
|
||||
}
|
||||
|
||||
public int getServiceTypeId() {
|
||||
return serviceTypeId;
|
||||
}
|
||||
|
||||
public void setServiceTypeId(int serviceTypeId) {
|
||||
this.serviceTypeId = serviceTypeId;
|
||||
}
|
||||
|
||||
public Double getRemainingQty() {return remainingQty; }
|
||||
|
||||
public void setRemainingQty(Double remainingQty) { this.remainingQty = remainingQty;}
|
||||
|
||||
}
|
||||
|
||||
37
AstuteSystem/src/main/java/com/astute/model/User.java
Normal file
37
AstuteSystem/src/main/java/com/astute/model/User.java
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
package com.astute.model;
|
||||
|
||||
public class User {
|
||||
int userId;
|
||||
String username;
|
||||
String password;
|
||||
|
||||
public User(int userId, String username, String password) {
|
||||
this.userId = userId;
|
||||
this.username = username;
|
||||
this.password = password;
|
||||
}
|
||||
|
||||
public int getUserId() {
|
||||
return userId;
|
||||
}
|
||||
|
||||
public void setUserId(int userId) {
|
||||
this.userId = userId;
|
||||
}
|
||||
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String password) {
|
||||
this.password = password;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.astute.provider;
|
||||
|
||||
import com.astute.response.ApiResponse;
|
||||
import com.astute.response.ApiResponse;
|
||||
|
||||
import javax.ws.rs.NotFoundException;
|
||||
import javax.ws.rs.core.Response;
|
||||
import javax.ws.rs.ext.ExceptionMapper;
|
||||
import javax.ws.rs.ext.Provider;
|
||||
|
||||
@Provider
|
||||
public class GeneralExceptionMapper implements ExceptionMapper<Exception> {
|
||||
@Override
|
||||
public Response toResponse(Exception e) {
|
||||
e.printStackTrace();
|
||||
return new ApiResponse(e).toResponse();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
package com.astute.provider;
|
||||
|
||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
||||
import com.fasterxml.jackson.datatype.joda.JodaModule;
|
||||
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
|
||||
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.ext.Provider;
|
||||
|
||||
@Provider
|
||||
@Produces({MediaType.APPLICATION_JSON})
|
||||
public class JacksonJsonProvider extends JacksonJaxbJsonProvider {
|
||||
|
||||
public JacksonJsonProvider() {
|
||||
ObjectMapper objectMapper = new ObjectMapper()
|
||||
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
|
||||
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
||||
.registerModule(new JodaModule())
|
||||
.setDateFormat(new RFC3339DateFormat());
|
||||
|
||||
setMapper(objectMapper);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
package com.astute.provider;
|
||||
|
||||
import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
|
||||
import com.fasterxml.jackson.databind.util.ISO8601Utils;
|
||||
|
||||
import java.text.FieldPosition;
|
||||
import java.util.Date;
|
||||
|
||||
public class RFC3339DateFormat extends ISO8601DateFormat {
|
||||
|
||||
// Same as ISO8601DateFormat but serializing milliseconds.
|
||||
@Override
|
||||
public StringBuffer format(Date date, StringBuffer toAppendTo,
|
||||
FieldPosition fieldPosition) {
|
||||
String value = ISO8601Utils.format(date, true);
|
||||
toAppendTo.append(value);
|
||||
return toAppendTo;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
package com.astute.provider;
|
||||
|
||||
import com.astute.response.ApiResponse;
|
||||
import com.astute.response.ApiResponse;
|
||||
|
||||
import javax.ws.rs.core.Response;
|
||||
import javax.ws.rs.ext.ExceptionMapper;
|
||||
|
||||
public class RuntimeExceptionMapper implements ExceptionMapper<RuntimeException> {
|
||||
@Override
|
||||
public Response toResponse(RuntimeException e) {
|
||||
e.printStackTrace();
|
||||
return new ApiResponse(e.hashCode(), e.getMessage()).toResponse();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
package com.astute.provider;
|
||||
|
||||
import com.astute.response.ApiResponse;
|
||||
import com.astute.response.ApiResponse;
|
||||
|
||||
import javax.ws.rs.WebApplicationException;
|
||||
import javax.ws.rs.core.Response;
|
||||
import javax.ws.rs.ext.ExceptionMapper;
|
||||
|
||||
public class WebApplicationExceptionMapper implements ExceptionMapper<WebApplicationException> {
|
||||
@Override
|
||||
public Response toResponse(WebApplicationException e) {
|
||||
e.printStackTrace();
|
||||
return new ApiResponse(e.getResponse().getStatus(), e.getMessage()).toResponse();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
package com.astute.requests;
|
||||
|
||||
import java.sql.Date;
|
||||
|
||||
public class ChangeOrderRequest {
|
||||
int changeOrderNum;
|
||||
String poNum;
|
||||
Date changeOrderDate;
|
||||
Double changeOrderAmt;
|
||||
String description;
|
||||
|
||||
public int getChangeOrderNum() {
|
||||
return changeOrderNum;
|
||||
}
|
||||
|
||||
public void setChangeOrderNum(int changeOrderNum) {
|
||||
this.changeOrderNum = changeOrderNum;
|
||||
}
|
||||
|
||||
public String getPoNum() {
|
||||
return poNum;
|
||||
}
|
||||
|
||||
public void setPoNum(String poNum) {
|
||||
this.poNum = poNum;
|
||||
}
|
||||
|
||||
public Date getChangeOrderDate() {
|
||||
return changeOrderDate;
|
||||
}
|
||||
|
||||
public void setChangeOrderDate(Date changeOrderDate) {
|
||||
this.changeOrderDate = changeOrderDate;
|
||||
}
|
||||
|
||||
public Double getChangeOrderAmt() {
|
||||
return changeOrderAmt;
|
||||
}
|
||||
|
||||
public void setChangeOrderAmt(Double changeOrderAmt) {
|
||||
this.changeOrderAmt = changeOrderAmt;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,114 @@
|
|||
package com.astute.requests;
|
||||
|
||||
import java.sql.Date;
|
||||
|
||||
public class CustomerRequest {
|
||||
int customerId;
|
||||
String customerName;
|
||||
String billToDept;
|
||||
String add1;
|
||||
String add2;
|
||||
String city;
|
||||
String state;
|
||||
int zip;
|
||||
int ziplast4;
|
||||
String email;
|
||||
int phone;
|
||||
int fax;
|
||||
|
||||
public int getCustomerId() {
|
||||
return customerId;
|
||||
}
|
||||
|
||||
public void setCustomerId(int customerId) {
|
||||
this.customerId = customerId;
|
||||
}
|
||||
|
||||
public String getCustomerName() {
|
||||
return customerName;
|
||||
}
|
||||
|
||||
public void setCustomerName(String customerName) {
|
||||
this.customerName = customerName;
|
||||
}
|
||||
|
||||
public String getBillToDept() {
|
||||
return billToDept;
|
||||
}
|
||||
|
||||
public void setBillToDept(String billToDept) {
|
||||
this.billToDept = billToDept;
|
||||
}
|
||||
|
||||
public String getAdd1() {
|
||||
return add1;
|
||||
}
|
||||
|
||||
public void setAdd1(String add1) {
|
||||
this.add1 = add1;
|
||||
}
|
||||
|
||||
public String getAdd2() {
|
||||
return add2;
|
||||
}
|
||||
|
||||
public void setAdd2(String add2) {
|
||||
this.add2 = add2;
|
||||
}
|
||||
|
||||
public String getCity() {
|
||||
return city;
|
||||
}
|
||||
|
||||
public void setCity(String city) {
|
||||
this.city = city;
|
||||
}
|
||||
|
||||
public String getState() {
|
||||
return state;
|
||||
}
|
||||
|
||||
public void setState(String state) {
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public int getZip() {
|
||||
return zip;
|
||||
}
|
||||
|
||||
public void setZip(int zip) {
|
||||
this.zip = zip;
|
||||
}
|
||||
|
||||
public int getZiplast4() {
|
||||
return ziplast4;
|
||||
}
|
||||
|
||||
public void setZiplast4(int ziplast4) {
|
||||
this.ziplast4 = ziplast4;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public int getPhone() {
|
||||
return phone;
|
||||
}
|
||||
|
||||
public void setPhone(int phone) {
|
||||
this.phone = phone;
|
||||
}
|
||||
|
||||
public int getFax() {
|
||||
return fax;
|
||||
}
|
||||
|
||||
public void setFax(int fax) {
|
||||
this.fax = fax;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
package com.astute.requests;
|
||||
|
||||
public class InvoiceDetailRequest {
|
||||
String invoiceNum;
|
||||
int lineItemNum;
|
||||
int poLineItemNum;
|
||||
int serviceTypeId;
|
||||
String desc;
|
||||
double percentCompletion;
|
||||
double hours;
|
||||
|
||||
public String getInvoiceNum() {
|
||||
return invoiceNum;
|
||||
}
|
||||
|
||||
public void setInvoiceNum(String invoiceNum) {
|
||||
this.invoiceNum = invoiceNum;
|
||||
}
|
||||
|
||||
public int getLineItemNum() {
|
||||
return lineItemNum;
|
||||
}
|
||||
|
||||
public void setLineItemNum(int lineItemNum) {
|
||||
this.lineItemNum = lineItemNum;
|
||||
}
|
||||
|
||||
public int getPoLineItemNum() {
|
||||
return poLineItemNum;
|
||||
}
|
||||
|
||||
public void setPoLineItemNum(int poLineItemNum) {
|
||||
this.poLineItemNum = poLineItemNum;
|
||||
}
|
||||
|
||||
public int getServiceTypeId() {
|
||||
return serviceTypeId;
|
||||
}
|
||||
|
||||
public void setServiceTypeId(int serviceTypeId) {
|
||||
this.serviceTypeId = serviceTypeId;
|
||||
}
|
||||
|
||||
public String getDesc() {
|
||||
return desc;
|
||||
}
|
||||
|
||||
public void setDesc(String desc) {
|
||||
this.desc = desc;
|
||||
}
|
||||
|
||||
public double getPercentCompletion() {
|
||||
return percentCompletion;
|
||||
}
|
||||
|
||||
public void setPercentCompletion(double percentCompletion) {
|
||||
this.percentCompletion = percentCompletion;
|
||||
}
|
||||
|
||||
public double getHours() {
|
||||
return hours;
|
||||
}
|
||||
|
||||
public void setHours(double hours) {
|
||||
this.hours = hours;
|
||||
}
|
||||
|
||||
public double getAnount() {
|
||||
return anount;
|
||||
}
|
||||
|
||||
public void setAnount(double anount) {
|
||||
this.anount = anount;
|
||||
}
|
||||
|
||||
double anount;
|
||||
}
|
||||
|
|
@ -0,0 +1,90 @@
|
|||
package com.astute.requests;
|
||||
|
||||
import java.sql.Date;
|
||||
|
||||
public class InvoiceMasterRequest {
|
||||
String invoiceNumber;
|
||||
Date invoiceDate;
|
||||
String poNum;
|
||||
String changeOrderNum;
|
||||
|
||||
public String getInvoiceNumber() {
|
||||
|
||||
return invoiceNumber;
|
||||
}
|
||||
|
||||
public void setInvoiceNumber(String invoiceNumber) {
|
||||
this.invoiceNumber = invoiceNumber;
|
||||
}
|
||||
|
||||
public Date getInvoiceDate() {
|
||||
return invoiceDate;
|
||||
}
|
||||
|
||||
public void setInvoiceDate(Date invoiceDate) {
|
||||
this.invoiceDate = invoiceDate;
|
||||
}
|
||||
|
||||
public String getPoNum() {
|
||||
return poNum;
|
||||
}
|
||||
|
||||
public void setPoNum(String poNum) {
|
||||
this.poNum = poNum;
|
||||
}
|
||||
|
||||
public String getChangeOrderNum() {
|
||||
return changeOrderNum;
|
||||
}
|
||||
|
||||
public void setChangeOrderNum(String changeOrderNum) {
|
||||
this.changeOrderNum = changeOrderNum;
|
||||
}
|
||||
|
||||
public int getPmtStatus() {
|
||||
return pmtStatus;
|
||||
}
|
||||
|
||||
public void setPmtStatus(int pmtStatus) {
|
||||
this.pmtStatus = pmtStatus;
|
||||
}
|
||||
|
||||
public Double getBillAmt() {
|
||||
return billAmt;
|
||||
}
|
||||
|
||||
public void setBillAmt(Double billAmt) {
|
||||
this.billAmt = billAmt;
|
||||
}
|
||||
|
||||
public String getSpecialNotes() {
|
||||
return specialNotes;
|
||||
}
|
||||
|
||||
public void setSpecialNotes(String specialNotes) {
|
||||
this.specialNotes = specialNotes;
|
||||
}
|
||||
|
||||
public String getCertification() {
|
||||
return certification;
|
||||
}
|
||||
|
||||
public void setCertification(String certification) {
|
||||
this.certification = certification;
|
||||
}
|
||||
|
||||
int pmtStatus;
|
||||
Double billAmt;
|
||||
String specialNotes;
|
||||
String certification;
|
||||
|
||||
public Date getPmtReceivedDate() {
|
||||
return pmtReceivedDate;
|
||||
}
|
||||
|
||||
public void setPmtReceivedDate(Date pmtReceivedDate) {
|
||||
this.pmtReceivedDate = pmtReceivedDate;
|
||||
}
|
||||
|
||||
Date pmtReceivedDate;
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
package com.astute.requests;
|
||||
|
||||
public class LoginRequest {
|
||||
private String username;
|
||||
private String password;
|
||||
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String password) {
|
||||
this.password = password;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,80 @@
|
|||
package com.astute.requests;
|
||||
|
||||
import java.sql.Date;
|
||||
|
||||
public class PODetailRequest {
|
||||
String PONum;
|
||||
int lineItemNo;
|
||||
|
||||
public String getPONum() {
|
||||
|
||||
return PONum;
|
||||
}
|
||||
|
||||
public void setPONum(String PONum) {
|
||||
this.PONum = PONum;
|
||||
}
|
||||
|
||||
public int getLineItemNo() {
|
||||
return lineItemNo;
|
||||
}
|
||||
|
||||
public void setLineItemNo(int lineItemNo) {
|
||||
this.lineItemNo = lineItemNo;
|
||||
}
|
||||
|
||||
public String getServiceDesc() {
|
||||
return serviceDesc;
|
||||
}
|
||||
|
||||
public void setServiceDesc(String serviceDesc) {
|
||||
this.serviceDesc = serviceDesc;
|
||||
}
|
||||
|
||||
public int getFeeTypeId() {
|
||||
return feeTypeId;
|
||||
}
|
||||
|
||||
public void setFeeTypeId(int feeTypeId) {
|
||||
this.feeTypeId = feeTypeId;
|
||||
}
|
||||
|
||||
public Double getQty() {
|
||||
return qty;
|
||||
}
|
||||
|
||||
public void setQty(Double qty) {
|
||||
this.qty = qty;
|
||||
}
|
||||
|
||||
public int getServiceTypeId() {
|
||||
return serviceTypeId;
|
||||
}
|
||||
|
||||
public void setServiceTypeId(int serviceTypeId) {
|
||||
this.serviceTypeId = serviceTypeId;
|
||||
}
|
||||
|
||||
public String getSchedule() {
|
||||
return schedule;
|
||||
}
|
||||
|
||||
public void setSchedule(String schedule) {
|
||||
this.schedule = schedule;
|
||||
}
|
||||
|
||||
public Date getDeliverBy() {
|
||||
return deliverBy;
|
||||
}
|
||||
|
||||
public void setDeliverBy(Date deliverBy) {
|
||||
this.deliverBy = deliverBy;
|
||||
}
|
||||
|
||||
String serviceDesc;
|
||||
int feeTypeId;
|
||||
Double qty;
|
||||
int serviceTypeId;
|
||||
String schedule;
|
||||
Date deliverBy;
|
||||
}
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
package com.astute.requests;
|
||||
|
||||
import java.sql.Date;
|
||||
|
||||
public class POMasterRequest {
|
||||
|
||||
private String PONum;
|
||||
private String contractNum;
|
||||
|
||||
public Integer getCustomerId() {
|
||||
return customerId;
|
||||
}
|
||||
|
||||
public void setCustomerId(Integer customerId) {
|
||||
this.customerId = customerId;
|
||||
}
|
||||
|
||||
private Date PODate;
|
||||
private Double contractAmt;
|
||||
private Integer customerId;
|
||||
|
||||
public String getPONum() {
|
||||
return PONum;
|
||||
}
|
||||
|
||||
public void setPONum(String PONum) {
|
||||
this.PONum = PONum;
|
||||
}
|
||||
|
||||
public String getContractNum() {
|
||||
return contractNum;
|
||||
}
|
||||
|
||||
public void setContractNum(String contractNum) {
|
||||
this.contractNum = contractNum;
|
||||
}
|
||||
|
||||
public Date getPODate() {
|
||||
return PODate;
|
||||
}
|
||||
|
||||
public void setPODate(Date PODate) {
|
||||
this.PODate = PODate;
|
||||
}
|
||||
|
||||
public Double getContractAmt() {
|
||||
return contractAmt;
|
||||
}
|
||||
|
||||
public void setContractAmt(Double contractAmt) {
|
||||
this.contractAmt = contractAmt;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
package com.astute.resources;
|
||||
|
||||
import com.astute.requests.LoginRequest;
|
||||
import com.astute.response.ApiResponse;
|
||||
import com.astute.service.AuthService;
|
||||
|
||||
import javax.ws.rs.*;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
import java.sql.SQLException;
|
||||
|
||||
@Path("auth")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public class AuthResource {
|
||||
|
||||
private com.astute.service.AuthService service = new AuthService();
|
||||
|
||||
public AuthResource() {
|
||||
|
||||
}
|
||||
|
||||
@POST
|
||||
public Response login(LoginRequest request) throws SQLException, Exception {
|
||||
String sessionId = service.login(request.getUsername(), request.getPassword());
|
||||
if (sessionId != null) {
|
||||
return new ApiResponse(sessionId).toResponse();
|
||||
} else {
|
||||
return new ApiResponse(ApiResponse.ACCESS_DENIED).toResponse();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package com.astute.resources;
|
||||
|
||||
import com.astute.requests.ChangeOrderRequest;
|
||||
import com.astute.response.ApiResponse;
|
||||
import com.astute.service.ChangeOrderService;
|
||||
|
||||
import javax.ws.rs.*;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
import java.sql.SQLException;
|
||||
|
||||
@Path("/changeOrder")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public class ChangeOrderResource {
|
||||
|
||||
private com.astute.service.ChangeOrderService service = new ChangeOrderService();
|
||||
|
||||
public ChangeOrderResource() {
|
||||
}
|
||||
|
||||
@GET
|
||||
public Response getChangeOrders(@QueryParam("poNum") String poNum)
|
||||
throws SQLException, Exception {
|
||||
return new ApiResponse(service.getChangeOrders(poNum)).toResponse();
|
||||
}
|
||||
|
||||
@Path("/{PONum}/{changeOrderNum}")
|
||||
@PUT
|
||||
public Response updateChangeOrder(ChangeOrderRequest request, @PathParam("PONum") String PONum, @PathParam("changeOrderNum") int changeOrderNum)
|
||||
throws SQLException, Exception {
|
||||
service.updateChangeOrder(PONum,changeOrderNum, request.getChangeOrderAmt(), request.getChangeOrderDate(), request.getDescription());
|
||||
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
|
||||
}
|
||||
|
||||
@POST
|
||||
public Response createChangeOrder(ChangeOrderRequest request)
|
||||
throws SQLException, Exception {
|
||||
return new ApiResponse(service.createChangeOrder(request.getPoNum(), request.getChangeOrderNum(), request.getChangeOrderAmt(),
|
||||
request.getChangeOrderDate(), request.getDescription())).toResponse();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
package com.astute.resources;
|
||||
|
||||
import com.astute.requests.CustomerRequest;
|
||||
import com.astute.response.ApiResponse;
|
||||
import com.astute.service.CustomerService;
|
||||
|
||||
import javax.ws.rs.*;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
import java.sql.SQLException;
|
||||
|
||||
@Path("/customer")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public class CustomerResource {
|
||||
|
||||
private com.astute.service.CustomerService service = new CustomerService();
|
||||
|
||||
public CustomerResource() {
|
||||
}
|
||||
|
||||
@GET
|
||||
public Response getCustomers(@QueryParam("customerId") int customerId)
|
||||
throws SQLException, Exception {
|
||||
return new ApiResponse(service.getCustomers(customerId)).toResponse();
|
||||
}
|
||||
|
||||
@Path("/{customerId}")
|
||||
@PUT
|
||||
public Response updateCustomer(@PathParam("customerId") int customerId, CustomerRequest request)
|
||||
throws SQLException, Exception {
|
||||
System.out.println("in updateCustomer()");
|
||||
service.updateCustomer(customerId, request.getCustomerName(), request.getBillToDept(), request.getAdd1(),
|
||||
request.getAdd2(), request.getCity(), request.getState(), request.getZip(), request.getZiplast4(), request.getEmail(), request.getPhone(), request.getFax());
|
||||
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
|
||||
}
|
||||
|
||||
@POST
|
||||
public Response createCustomer(CustomerRequest request)
|
||||
throws SQLException, Exception {
|
||||
System.out.println("in AstuteSyste createCustomer()");
|
||||
return new ApiResponse(service.createCustomer(request.getCustomerName(), request.getBillToDept(), request.getAdd1(),
|
||||
request.getAdd2(), request.getCity(), request.getState(), request.getZip(), request.getZiplast4(), request.getEmail(), request.getPhone(), request.getFax())).toResponse();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
package com.astute.resources;
|
||||
|
||||
import com.astute.exceptions.*;
|
||||
import com.astute.requests.*;
|
||||
import com.astute.response.ApiResponse;
|
||||
import com.astute.service.InvoiceService;
|
||||
|
||||
import javax.ws.rs.*;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
import java.sql.Date;
|
||||
import java.sql.SQLException;
|
||||
|
||||
@Path("/invoice")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public class InvoiceResource {
|
||||
|
||||
private com.astute.service.InvoiceService service = new InvoiceService();
|
||||
|
||||
public InvoiceResource() {
|
||||
}
|
||||
|
||||
@GET
|
||||
public Response getInvoiceMaster(@QueryParam("invoiceNumber") String invoiceNumber, @QueryParam("pmtStatus") int pmtStatus)
|
||||
throws SQLException, Exception {
|
||||
return new ApiResponse(service.getInvoiceMaster(invoiceNumber, pmtStatus)).toResponse();
|
||||
}
|
||||
|
||||
@Path("/detail")
|
||||
@GET
|
||||
public Response getInvoiceDetail(@QueryParam("invoiceNumber") String invoiceNumber, @QueryParam("lineItemNo") int lineItemNo)
|
||||
throws SQLException, Exception {
|
||||
|
||||
return new ApiResponse(service.getInvoiceDetail(invoiceNumber,lineItemNo)).toResponse();
|
||||
}
|
||||
|
||||
@Path("/{InvoiceNum}")
|
||||
@PUT
|
||||
public Response updateInvoiceMaster(@PathParam("InvoiceNum") String InvoiceNum, InvoiceMasterRequest request)
|
||||
throws SQLException, Exception {
|
||||
service.updateInvoiceMaster(InvoiceNum, request.getInvoiceDate(), request.getPoNum(), request.getChangeOrderNum(),
|
||||
request.getPmtStatus(), request.getBillAmt(), request.getSpecialNotes(), request.getCertification());
|
||||
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
|
||||
}
|
||||
|
||||
@Path("/detail/{InvoiceNum}/{lineItemNum}")
|
||||
@PUT
|
||||
public Response updateInvoiceDetail(@PathParam("InvoiceNum") String InvoiceNum, @PathParam("lineItemNum") int lineItemNum, InvoiceDetailRequest request)
|
||||
throws DatabaseException, Exception {
|
||||
service.updateInvoiceDetail(InvoiceNum, lineItemNum, request.getPoLineItemNum(), request.getServiceTypeId(),
|
||||
request.getDesc(), request.getPercentCompletion(), request.getHours(), request.getAnount());
|
||||
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
|
||||
}
|
||||
@POST
|
||||
public Response createInvoiceMaster(InvoiceMasterRequest request)
|
||||
throws DatabaseException, Exception {
|
||||
service.createInvoiceMaster(request.getInvoiceNumber(), request.getInvoiceDate(), request.getPoNum(), request.getChangeOrderNum(),
|
||||
request.getPmtStatus(), request.getBillAmt(), request.getSpecialNotes(), request.getCertification());
|
||||
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
|
||||
}
|
||||
@Path("/detail")
|
||||
@POST
|
||||
public Response createInvoiceDetail(InvoiceDetailRequest request)
|
||||
throws SQLException, Exception {
|
||||
service.createInvoiceDetail(request.getInvoiceNum(), request.getLineItemNum(), request.getPoLineItemNum(), request.getServiceTypeId(),
|
||||
request.getDesc(), request.getPercentCompletion(), request.getHours(), request.getAnount());
|
||||
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
|
||||
}
|
||||
|
||||
@Path("/generatedInvoice/{InvoiceNum}")
|
||||
@GET
|
||||
public Response getGeneratedInvoice(@PathParam("InvoiceNum") String InvoiceNum) throws SQLException, Exception {
|
||||
|
||||
return new ApiResponse(service.getGeneratedInvoice(InvoiceNum)).toResponse();
|
||||
}
|
||||
|
||||
@Path("/generateInvoiceNumber/{PONum}")
|
||||
@GET
|
||||
public Response generateInvoiceNumber(@PathParam("PONum") String PONum) throws SQLException, Exception {
|
||||
|
||||
return new ApiResponse(service.generateInvoiceNumber(PONum)).toResponse();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
package com.astute.resources;
|
||||
|
||||
import javax.ws.rs.*;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import javax.ws.rs.core.Response;
|
||||
|
||||
import com.astute.exceptions.*;
|
||||
import com.astute.requests.*;
|
||||
import com.astute.response.*;
|
||||
import com.astute.service.*;
|
||||
|
||||
import java.sql.Date;
|
||||
import java.sql.SQLException;
|
||||
|
||||
@Path("/po")
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public class POResource {
|
||||
|
||||
private POService POService = new POService();
|
||||
|
||||
public POResource() {
|
||||
}
|
||||
|
||||
@GET
|
||||
public Response getPOMaster(
|
||||
@QueryParam("PONum") String PONum,
|
||||
@QueryParam("ContractNum") String contractNum,
|
||||
@QueryParam("PODate") Date PODate)
|
||||
throws SQLException, Exception {
|
||||
return new ApiResponse(POService.getPOMaster(PONum, contractNum, PODate)).toResponse();
|
||||
}
|
||||
|
||||
@Path("/detail")
|
||||
@GET
|
||||
public Response getPODetail(@QueryParam("PONum") String PONum, @QueryParam("lineItemNo") int lineItemNo)
|
||||
throws SQLException, Exception {
|
||||
return new ApiResponse(POService.getPODetail(PONum, lineItemNo)).toResponse();
|
||||
}
|
||||
|
||||
@Path("/{PONum}")
|
||||
@PUT
|
||||
public Response updatePOMaster(@PathParam("PONum") String PONum, POMasterRequest request)
|
||||
throws SQLException, Exception {
|
||||
POService.updatePOMaster(PONum, request.getContractNum(), request.getPODate(), request.getContractAmt());
|
||||
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
|
||||
}
|
||||
|
||||
@Path("/detail/{PONum}/{lineItemNo}")
|
||||
@PUT
|
||||
public Response updatePODetail(@PathParam("PONum") String PONum, @PathParam("lineItemNo") int lineItemNo, PODetailRequest request)
|
||||
throws SQLException, Exception {
|
||||
POService.updatePODetail(PONum, lineItemNo, request.getServiceDesc(), request.getFeeTypeId(),
|
||||
request.getQty(), request.getServiceTypeId(), request.getSchedule(), request.getDeliverBy());
|
||||
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
|
||||
}
|
||||
|
||||
@POST
|
||||
public Response createPOMaster(POMasterRequest request)
|
||||
throws SQLException, Exception {
|
||||
System.out.println(request.getPONum());
|
||||
POService.createPOMaster(request.getPONum(), request.getContractNum(), request.getPODate(), request.getContractAmt(), request.getCustomerId());
|
||||
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
|
||||
}
|
||||
@Path("/detail")
|
||||
@POST
|
||||
public Response createPODetail(PODetailRequest request)
|
||||
throws SQLException, Exception {
|
||||
POService.createPODetail(request.getPONum(), request.getLineItemNo(), request.getServiceDesc(), request.getFeeTypeId(),
|
||||
request.getQty(), request.getServiceTypeId(), request.getSchedule(), request.getDeliverBy());
|
||||
return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
package com.astute.response;
|
||||
|
||||
import javax.ws.rs.core.Response;
|
||||
|
||||
import static com.astute.common.Constants.SUCCESS;
|
||||
|
||||
public class ApiResponse {
|
||||
private Integer code = null;
|
||||
private String message = null;
|
||||
private Object entity = null;
|
||||
|
||||
public static final String GRANT_ACCESS_SUCCESS = "Access successfully granted";
|
||||
public static final String UPDATE_ACCESS_SUCESS = "Successfully updated access";
|
||||
public static final String ACCESS_DENIED = "Logon failed";
|
||||
|
||||
|
||||
private static final String SUCCESS_MSG = "Success";
|
||||
|
||||
public ApiResponse() {
|
||||
}
|
||||
|
||||
public ApiResponse(Object entity) {
|
||||
this.code = SUCCESS;
|
||||
this.message = SUCCESS_MSG;
|
||||
this.entity = entity;
|
||||
}
|
||||
|
||||
public ApiResponse(int code, String message) {
|
||||
this.code = code;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public ApiResponse(Exception exception) {
|
||||
this.code = exception.hashCode();
|
||||
this.message = exception.toString();
|
||||
}
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setCode(int code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public Object getEntity() {
|
||||
return entity;
|
||||
}
|
||||
|
||||
public void setEntity(Object entity) {
|
||||
this.entity = entity;
|
||||
}
|
||||
|
||||
public Response toResponse() {
|
||||
return Response.ok()
|
||||
.entity(this)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
package com.astute.service;
|
||||
|
||||
|
||||
import com.astute.exceptions.AstuteException;
|
||||
|
||||
import java.sql.SQLException;
|
||||
|
||||
import static com.astute.dao.DAO.getDao;
|
||||
|
||||
public class AuthService extends Service{
|
||||
public AuthService(){
|
||||
super();
|
||||
}
|
||||
|
||||
public String login(String username, String password)
|
||||
throws AstuteException {
|
||||
return getDao().login(username,password);
|
||||
}
|
||||
|
||||
public void updateCustomer( int customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax)
|
||||
throws AstuteException {
|
||||
getDao().updateCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax);
|
||||
}
|
||||
|
||||
|
||||
public void createCustomer(String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax)
|
||||
throws AstuteException {
|
||||
getDao().createCustomer(customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
package com.astute.service;
|
||||
|
||||
import com.astute.exceptions.AstuteException;
|
||||
import com.astute.model.*;
|
||||
|
||||
import java.sql.Date;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
|
||||
import static com.astute.dao.DAO.getDao;
|
||||
|
||||
public class ChangeOrderService extends Service{
|
||||
public ChangeOrderService(){
|
||||
super();
|
||||
}
|
||||
|
||||
public List<ChangeOrder> getChangeOrders(String poNum)
|
||||
throws AstuteException {
|
||||
return getDao().getChangeOrders(poNum);
|
||||
}
|
||||
|
||||
public void updateChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description)
|
||||
throws AstuteException {
|
||||
getDao().updateChangeOrder(poNum, changeOrderNum, changeOrderAmt, changeOrderDate, description);
|
||||
}
|
||||
|
||||
|
||||
public int createChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description)
|
||||
throws AstuteException {
|
||||
return getDao().createChangeOrder(poNum, changeOrderNum, changeOrderAmt, changeOrderDate, description);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
package com.astute.service;
|
||||
|
||||
import com.astute.exceptions.AstuteException;
|
||||
import com.astute.model.Customer;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
|
||||
import static com.astute.dao.DAO.getDao;
|
||||
|
||||
public class CustomerService extends Service{
|
||||
public CustomerService(){
|
||||
super();
|
||||
}
|
||||
|
||||
public List<Customer> getCustomers(int customerId)
|
||||
throws AstuteException {
|
||||
return getDao().getCustomers(customerId);
|
||||
}
|
||||
|
||||
public void updateCustomer( int customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax)
|
||||
throws AstuteException {
|
||||
getDao().updateCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax);
|
||||
}
|
||||
|
||||
|
||||
public int createCustomer(String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax)
|
||||
throws AstuteException {
|
||||
return getDao().createCustomer(customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
package com.astute.service;
|
||||
|
||||
import com.astute.exceptions.*;
|
||||
import com.astute.model.*;
|
||||
|
||||
import java.sql.Date;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
|
||||
import static com.astute.dao.DAO.getDao;
|
||||
|
||||
public class InvoiceService extends Service{
|
||||
public InvoiceService(){
|
||||
super();
|
||||
}
|
||||
|
||||
public List<Invoice> getInvoiceMaster(String invoiceNumber, int pmtStatus)
|
||||
throws AstuteException {
|
||||
return getDao().getInvoiceMaster(invoiceNumber, pmtStatus);
|
||||
}
|
||||
|
||||
public List<InvoiceDetail> getInvoiceDetail(String invoiceNumber, int lineItemNo)
|
||||
throws AstuteException {
|
||||
return getDao().getInvoiceDetail(invoiceNumber, lineItemNo);
|
||||
}
|
||||
|
||||
public void updateInvoiceMaster(String invoiceNum, Date invoiceDate, String PONum, String changeOrderNum,
|
||||
int pmtStatus, Double billAmt, String specialNotes, String certification)
|
||||
throws AstuteException {
|
||||
getDao().updateInvoiceMaster(invoiceNum, invoiceDate, PONum, changeOrderNum, pmtStatus, billAmt, specialNotes, certification);
|
||||
}
|
||||
|
||||
|
||||
public void updateInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc,
|
||||
double percentCompletion, double hours, double amount)
|
||||
throws AstuteException {
|
||||
getDao().updateInvoiceDetail(invoiceNum, lineItemNum, POLineItemNum, serviceTypeId, desc,
|
||||
percentCompletion, hours, amount);
|
||||
}
|
||||
|
||||
public void createInvoiceMaster(String invoiceNum, Date invoiceDate, String PONum, String changeOrderNum,
|
||||
int pmtStatus, Double billAmt, String specialNotes, String certification)
|
||||
throws AstuteException {
|
||||
getDao().createInvoiceMaster(invoiceNum, invoiceDate, PONum, changeOrderNum, pmtStatus, billAmt, specialNotes, certification);
|
||||
}
|
||||
|
||||
public void createInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc,
|
||||
double percentCompletion, double hours, double amount)
|
||||
throws AstuteException {
|
||||
getDao().createInvoiceDetail(invoiceNum, lineItemNum, POLineItemNum, serviceTypeId, desc,
|
||||
percentCompletion, hours, amount);
|
||||
}
|
||||
|
||||
public GeneratedInvoice getGeneratedInvoice(String invoiceNumber)
|
||||
throws AstuteException {
|
||||
return getDao().getGeneratedInvoice(invoiceNumber);
|
||||
}
|
||||
|
||||
public String generateInvoiceNumber(String poNum)
|
||||
throws AstuteException {
|
||||
return getDao().generateInvoiceNumber(poNum);
|
||||
}
|
||||
}
|
||||
52
AstuteSystem/src/main/java/com/astute/service/POService.java
Normal file
52
AstuteSystem/src/main/java/com/astute/service/POService.java
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
package com.astute.service;
|
||||
|
||||
import com.astute.exceptions.*;
|
||||
import com.astute.model.PO;
|
||||
import com.astute.model.PODetail;
|
||||
|
||||
import java.sql.Date;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
|
||||
import static com.astute.dao.DAO.getDao;
|
||||
|
||||
public class POService extends Service{
|
||||
public POService(){
|
||||
super();
|
||||
}
|
||||
|
||||
public List<PO> getPOMaster(String PONum, String contractNum, Date PODate)
|
||||
throws AstuteException {
|
||||
return getDao().getPOMaster(PONum, contractNum, PODate);
|
||||
}
|
||||
|
||||
public List<PODetail> getPODetail(String PONum, int lineItemNo)
|
||||
throws AstuteException {
|
||||
return getDao().getPODetail(PONum,lineItemNo);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public void updatePOMaster(String PONum, String contractNum, Date PODate, Double contractAmt)
|
||||
throws AstuteException {
|
||||
getDao().updatePOMaster(PONum, contractNum, PODate, contractAmt);
|
||||
}
|
||||
|
||||
public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, Date deiverBy)
|
||||
throws AstuteException {
|
||||
getDao().updatePODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, serviceTypeId, schedule, deiverBy);
|
||||
}
|
||||
|
||||
public void createPOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, Integer customerId)
|
||||
throws AstuteException {
|
||||
getDao().createPOMaster(PONum, contractNum, PODate, contractAmt, customerId);
|
||||
}
|
||||
|
||||
public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, Date deiverBy)
|
||||
throws AstuteException {
|
||||
getDao().createPODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, serviceTypeId, schedule, deiverBy);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
11
AstuteSystem/src/main/java/com/astute/service/Service.java
Normal file
11
AstuteSystem/src/main/java/com/astute/service/Service.java
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
package com.astute.service;
|
||||
|
||||
import com.astute.exceptions.*;
|
||||
|
||||
import static com.astute.dao.DAO.getDao;
|
||||
|
||||
public class Service {
|
||||
|
||||
public Service() {
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
package com.astute.servlets;
|
||||
|
||||
import com.astute.exceptions.AstuteException;
|
||||
import com.astute.exceptions.DatabaseException;
|
||||
import com.astute.dao.DAO;
|
||||
|
||||
import javax.servlet.http.HttpServlet;
|
||||
|
||||
public class StartupServlet extends HttpServlet {
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
try {
|
||||
DAO.init();
|
||||
}
|
||||
catch (AstuteException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
27
AstuteSystem/src/main/webapp/WEB-INF/web.xml
Normal file
27
AstuteSystem/src/main/webapp/WEB-INF/web.xml
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- This web.xml file is not required when using Servlet 3.0 container,
|
||||
see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html -->
|
||||
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
|
||||
<servlet>
|
||||
<servlet-name>Jersey Web Application</servlet-name>
|
||||
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
|
||||
<init-param>
|
||||
<param-name>jersey.config.server.provider.packages</param-name>
|
||||
<param-value>com.astute</param-value>
|
||||
</init-param>
|
||||
<load-on-startup>1</load-on-startup>
|
||||
</servlet>
|
||||
<servlet-mapping>
|
||||
<servlet-name>Jersey Web Application</servlet-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</servlet-mapping>
|
||||
<servlet>
|
||||
<servlet-name>startup</servlet-name>
|
||||
<servlet-class>com.astute.servlets.StartupServlet</servlet-class>
|
||||
<load-on-startup>2</load-on-startup>
|
||||
</servlet>
|
||||
<servlet-mapping>
|
||||
<servlet-name>startup</servlet-name>
|
||||
<url-pattern>/startup/*</url-pattern>
|
||||
</servlet-mapping>
|
||||
</web-app>
|
||||
54
AstuteSystem/src/main/webapp/css/nav.css
Normal file
54
AstuteSystem/src/main/webapp/css/nav.css
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
body {margin:0;}
|
||||
|
||||
.header ul {
|
||||
list-style-type: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
background-color: #333;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.header li {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.header li a {
|
||||
display: block;
|
||||
color: white;
|
||||
text-align: center;
|
||||
padding: 14px 16px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.header li a:hover:not(.active) {
|
||||
background-color: #111;
|
||||
}
|
||||
|
||||
.pmactive {
|
||||
background-color: var(--pm-blue);
|
||||
}
|
||||
|
||||
.content{
|
||||
margin: 55px 0 0 0;
|
||||
}
|
||||
|
||||
.footer{
|
||||
position: fixed;
|
||||
top: 45px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.error{
|
||||
color: white;
|
||||
background: #f44336;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.success{
|
||||
color: white;
|
||||
background: #4CAF50;
|
||||
cursor: pointer;
|
||||
}
|
||||
122
AstuteSystem/src/main/webapp/css/theme.css
Normal file
122
AstuteSystem/src/main/webapp/css/theme.css
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
:root{
|
||||
--pm-background-color: lightgrey;
|
||||
--pm-blue: #5998ff;
|
||||
--pm-green: #4CAF50;
|
||||
--pm-dark-blue: #2e79f4;
|
||||
--pm-dark-green: #4c9450;
|
||||
--pm-button-hover-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
|
||||
--pm-button-active-shadow: none;
|
||||
--pm-font: "Roboto", sans-serif;
|
||||
}
|
||||
|
||||
*{
|
||||
font-family: var(--pm-font);
|
||||
}
|
||||
|
||||
.card {
|
||||
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
|
||||
transition: 0.3s;
|
||||
padding: 5px;
|
||||
background: white;
|
||||
}
|
||||
|
||||
body {
|
||||
background: lightgrey;
|
||||
}
|
||||
|
||||
/* BUTTONS */
|
||||
.green-btn {
|
||||
text-transform: uppercase;
|
||||
outline: 0;
|
||||
background: var(--pm-green);
|
||||
width: 100%;
|
||||
border: 0;
|
||||
padding: 15px;
|
||||
color: white;
|
||||
font-size: 14px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.green-btn:hover{
|
||||
box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
.green-btn:active{
|
||||
box-shadow:none;
|
||||
background: var(--pm-dark-green);
|
||||
}
|
||||
|
||||
.blue-btn {
|
||||
text-transform: uppercase;
|
||||
outline: 0;
|
||||
background: var(--pm-blue);
|
||||
width: 100%;
|
||||
border: 0;
|
||||
padding: 15px;
|
||||
color: white;
|
||||
font-size: 14px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.blue-btn:hover{
|
||||
box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
|
||||
.blue-btn:active{
|
||||
box-shadow:none;
|
||||
background: var(--pm-dark-blue);
|
||||
}
|
||||
|
||||
.expand input {
|
||||
background: #eee;
|
||||
padding: 10px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.expand:after {
|
||||
display: block;
|
||||
content: "";
|
||||
border-bottom: 3px solid var(--pm-dark-blue);
|
||||
transform: scaleX(0);
|
||||
transition: transform 0.5s;
|
||||
transform-origin: 0% 50%;
|
||||
}
|
||||
|
||||
.expand:hover:after {
|
||||
transform: scaleX(1);
|
||||
}
|
||||
|
||||
/* TEXT INPUT */
|
||||
.blue-txt {
|
||||
background: white;
|
||||
width: 100%;
|
||||
border:0;
|
||||
border-bottom: solid var(--pm-blue);
|
||||
padding: 15px;
|
||||
box-sizing: border-box;
|
||||
font-size: 14px;
|
||||
}
|
||||
.green-txt {
|
||||
background: white;
|
||||
width: 100%;
|
||||
border:0;
|
||||
border-bottom: solid var(--pm-green);
|
||||
padding: 15px;
|
||||
box-sizing: border-box;
|
||||
font-size: 14px;
|
||||
}
|
||||
.blue-txt:focus{
|
||||
border-bottom: solid var(--pm-dark-blue);
|
||||
}
|
||||
.green-txt:focus{
|
||||
border-bottom: solid var(--pm-dark-green);
|
||||
}
|
||||
.blue-txt, .green-txt{
|
||||
outline: none;
|
||||
}
|
||||
.blue-txt, .green-txt{
|
||||
outline: none;
|
||||
}
|
||||
|
||||
form label{
|
||||
margin-top: 5%;
|
||||
}
|
||||
|
||||
105
AstuteSystem/src/main/webapp/doc/user-guide.jsp
Normal file
105
AstuteSystem/src/main/webapp/doc/user-guide.jsp
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
<html>
|
||||
<body>
|
||||
<head>
|
||||
<title>PM User Guide</title>
|
||||
<link rel="stylesheet" href="./css/theme.css">
|
||||
<link rel="stylesheet" href="./css/nav.css">
|
||||
<style type="text/css">
|
||||
h1, h3, h5 {
|
||||
font-family: "Times New Roman", Times, serif;
|
||||
color: #2196F3;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: "Times New Roman", Times, serif;
|
||||
background: lightgrey;
|
||||
}
|
||||
|
||||
dt {
|
||||
font-weight: bold;
|
||||
padding-left: 30px;
|
||||
font-family: "Times New Roman", Times, serif;
|
||||
color: #2196F3;
|
||||
}
|
||||
|
||||
dd {
|
||||
padding-left: 30px;
|
||||
}
|
||||
|
||||
.doc-div {
|
||||
margin-left: 14%;
|
||||
margin-right: 14%;
|
||||
margin-bottom: 3%;
|
||||
background: white;
|
||||
}
|
||||
|
||||
.card {
|
||||
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
|
||||
transition: 0.3s;
|
||||
padding: 5px;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<div class="doc-div card">
|
||||
<h1 align="center">Policy Machine Overview</h1>
|
||||
<p>Click <a href="./doc/PMUserGuide.pdf" target="_blank">here</a> for the Policy Machine User Guide</p>
|
||||
</div>
|
||||
|
||||
<div class="doc-div card">
|
||||
<h1 align="center">Policy Machine Entities</h1>
|
||||
<h3>Nodes</h3>
|
||||
<dl style="list-style-type: none">
|
||||
<dt>Policy Class</dt>
|
||||
<br>
|
||||
<dd>A Policy Class node is the base node for any policy. For example, the Role Based Access Control policy will have a Policy Class node called RBAC in which the policy is contained.</dd>
|
||||
<br>
|
||||
<dt>Object Attribute</dt>
|
||||
<br>
|
||||
<dd>An Object Attribure node is a container that can hold other Object Attrbibutes or objects, and are often the target of the policies that are defined by the Policy Class they are assigned to.
|
||||
For example, in a Multiple Layer Security (MLS) Policy Class, there may be an Object Attribute labeled "Top Secret". The nodes (Object Attributes or Objects) that are then assigned to this Object
|
||||
Attribute might be subjected to the policies defined by the MLS policy class on "Top Secret".</dd>
|
||||
<br>
|
||||
<dt>Object</dt>
|
||||
<br>
|
||||
<dd>An Object is a representation of data, whether the data is on a file system or in a schema.</dd>
|
||||
<br>
|
||||
<dt>User Attribute</dt>
|
||||
<br>
|
||||
<dd>A User Attribute node is a collection of one or many users.</dd>
|
||||
<br>
|
||||
<dt>User</dt>
|
||||
<br>
|
||||
<dd>A User node is a representation of a User of the Policy Machine.</dd>
|
||||
<br>
|
||||
<dt>Operation Set</dt>
|
||||
<br>
|
||||
<dd>An Operation Set node is a collection of Operations. This set is then used to connect a User Attribute to an Object Attribute, creating an association relationship in which the users that belong to the
|
||||
User Attribute are granted the rights in the Operation set on the Object Attribute. For example, if there is an Object Attribute called "Medical Records" and a User Attribute called "Doctors" and we want to give
|
||||
doctors the permission to read and write, we would create the association: "Doctor" ---> Operation Set{read, write} ---> "Medical Records".</dd>
|
||||
<br>
|
||||
</dl>
|
||||
|
||||
<h3>Deny Constraints</h3>
|
||||
<p>While Policies can be defined on tables and columns, there is still a need to restrict access at the record field level. For example, consider a table called "Employee Record" with the columns: Name, Phone Number, Salary and a User Bob.
|
||||
The Name and Phone Number fields may be public information available to everyone, however, the Salary field is private data and Bob can only read his own salary, no one elses. We can use a deny constraint to deny
|
||||
Bob the ability to read the column "Salary" instersected with the complement of his own Record. This would lead to Bob only being able to read the Salary field of his own record.</p>
|
||||
<h3>Assignments</h3>
|
||||
<p>Assignments are fundamental to the Policy Machine because they are how Policies are created and enforced.</p>
|
||||
<h3>Operations</h3>
|
||||
<p>Brief explanation of different kinds (class) of Operations. Describe resource vs admin</p>
|
||||
<h3>Policy Scripts</h3>
|
||||
Policy Scripts are another means of defining policies in the Policy Machine. For example, we can write a script that when a User is created, an Object Attribute called User Home is also created. We can then grant the new User the permissions
|
||||
read and write on that Object Attribute. This is just one example of using Policy Scripts. An in-depth documentation with example scripts is available <a href="./doc/policyScriptsDoc.pdf" target="_blank">here</a>.
|
||||
</div>
|
||||
<div class="doc-div card">
|
||||
<h1 align="center">Examples</h1>
|
||||
<p>Examples and use cases of Policy Machine calls</p>
|
||||
</div>
|
||||
<div class="doc-div card">
|
||||
<h1 align="center">Policy Machine API</h1>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
BIN
AstuteSystem/src/main/webapp/images/logo.png
Normal file
BIN
AstuteSystem/src/main/webapp/images/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.1 KiB |
18
AstuteSystem/src/main/webapp/images/nist-logo.svg
Normal file
18
AstuteSystem/src/main/webapp/images/nist-logo.svg
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="-237 385.7 109.7 29.3" style="enable-background:new -237 385.7 109.7 29.3;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#FFFFFF;}
|
||||
</style>
|
||||
<g>
|
||||
<g>
|
||||
<path class="st0" d="M-231,415h-6v-23.1c0,0,0-4.4,4.4-5.8c4-1.3,6.6,1.3,6.6,1.3l19.7,21.3c1,0.6,1.4,0,1.4-0.6v-22h6.1V409
|
||||
c0,1.9-1.6,4.4-4,5.3c-2.4,0.9-4.9,0.9-7.9-1.7l-18.5-20c-0.5-0.5-1.8-0.6-1.8,0.4L-231,415L-231,415z"/>
|
||||
<path class="st0" d="M-195,386.1h6.1v20.7c0,2.2,1.9,2.2,3.6,2.2h26.8c1.1,0,2.4-1.3,2.4-2.7c0-1.4-1.3-2.8-2.5-2.8H-176
|
||||
c-3,0.1-9.2-2.7-9.2-8.5c0-7.1,5.9-8.8,8.6-9h49.4v6.1h-12.3V415h-6v-22.9h-30.2c-2.9-0.2-4.9,4.7-0.2,5.4h18.6
|
||||
c2.8,0,7.4,2.4,7.5,8.4c0,6.1-3.6,9-7.5,9H-185c-4.5,0-6.2-1.1-7.8-2.5c-1.5-1.5-1.7-2.3-2.2-5.3L-195,386.1
|
||||
C-194.9,386.1-195,386.1-195,386.1z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.0 KiB |
3
AstuteSystem/src/main/webapp/index.html
Normal file
3
AstuteSystem/src/main/webapp/index.html
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
Welcome
|
||||
|
||||
Astute LLC
|
||||
5
AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF
Normal file
5
AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
Manifest-Version: 1.0
|
||||
Built-By: gnk5
|
||||
Created-By: IntelliJ IDEA
|
||||
Build-Jdk: 1.8.0_171
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
54
AstuteSystem/target/astutesystem/css/nav.css
Normal file
54
AstuteSystem/target/astutesystem/css/nav.css
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
body {margin:0;}
|
||||
|
||||
.header ul {
|
||||
list-style-type: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
background-color: #333;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.header li {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.header li a {
|
||||
display: block;
|
||||
color: white;
|
||||
text-align: center;
|
||||
padding: 14px 16px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.header li a:hover:not(.active) {
|
||||
background-color: #111;
|
||||
}
|
||||
|
||||
.pmactive {
|
||||
background-color: var(--pm-blue);
|
||||
}
|
||||
|
||||
.content{
|
||||
margin: 55px 0 0 0;
|
||||
}
|
||||
|
||||
.footer{
|
||||
position: fixed;
|
||||
top: 45px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.error{
|
||||
color: white;
|
||||
background: #f44336;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.success{
|
||||
color: white;
|
||||
background: #4CAF50;
|
||||
cursor: pointer;
|
||||
}
|
||||
122
AstuteSystem/target/astutesystem/css/theme.css
Normal file
122
AstuteSystem/target/astutesystem/css/theme.css
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
:root{
|
||||
--pm-background-color: lightgrey;
|
||||
--pm-blue: #5998ff;
|
||||
--pm-green: #4CAF50;
|
||||
--pm-dark-blue: #2e79f4;
|
||||
--pm-dark-green: #4c9450;
|
||||
--pm-button-hover-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
|
||||
--pm-button-active-shadow: none;
|
||||
--pm-font: "Roboto", sans-serif;
|
||||
}
|
||||
|
||||
*{
|
||||
font-family: var(--pm-font);
|
||||
}
|
||||
|
||||
.card {
|
||||
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
|
||||
transition: 0.3s;
|
||||
padding: 5px;
|
||||
background: white;
|
||||
}
|
||||
|
||||
body {
|
||||
background: lightgrey;
|
||||
}
|
||||
|
||||
/* BUTTONS */
|
||||
.green-btn {
|
||||
text-transform: uppercase;
|
||||
outline: 0;
|
||||
background: var(--pm-green);
|
||||
width: 100%;
|
||||
border: 0;
|
||||
padding: 15px;
|
||||
color: white;
|
||||
font-size: 14px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.green-btn:hover{
|
||||
box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
.green-btn:active{
|
||||
box-shadow:none;
|
||||
background: var(--pm-dark-green);
|
||||
}
|
||||
|
||||
.blue-btn {
|
||||
text-transform: uppercase;
|
||||
outline: 0;
|
||||
background: var(--pm-blue);
|
||||
width: 100%;
|
||||
border: 0;
|
||||
padding: 15px;
|
||||
color: white;
|
||||
font-size: 14px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.blue-btn:hover{
|
||||
box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
|
||||
.blue-btn:active{
|
||||
box-shadow:none;
|
||||
background: var(--pm-dark-blue);
|
||||
}
|
||||
|
||||
.expand input {
|
||||
background: #eee;
|
||||
padding: 10px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.expand:after {
|
||||
display: block;
|
||||
content: "";
|
||||
border-bottom: 3px solid var(--pm-dark-blue);
|
||||
transform: scaleX(0);
|
||||
transition: transform 0.5s;
|
||||
transform-origin: 0% 50%;
|
||||
}
|
||||
|
||||
.expand:hover:after {
|
||||
transform: scaleX(1);
|
||||
}
|
||||
|
||||
/* TEXT INPUT */
|
||||
.blue-txt {
|
||||
background: white;
|
||||
width: 100%;
|
||||
border:0;
|
||||
border-bottom: solid var(--pm-blue);
|
||||
padding: 15px;
|
||||
box-sizing: border-box;
|
||||
font-size: 14px;
|
||||
}
|
||||
.green-txt {
|
||||
background: white;
|
||||
width: 100%;
|
||||
border:0;
|
||||
border-bottom: solid var(--pm-green);
|
||||
padding: 15px;
|
||||
box-sizing: border-box;
|
||||
font-size: 14px;
|
||||
}
|
||||
.blue-txt:focus{
|
||||
border-bottom: solid var(--pm-dark-blue);
|
||||
}
|
||||
.green-txt:focus{
|
||||
border-bottom: solid var(--pm-dark-green);
|
||||
}
|
||||
.blue-txt, .green-txt{
|
||||
outline: none;
|
||||
}
|
||||
.blue-txt, .green-txt{
|
||||
outline: none;
|
||||
}
|
||||
|
||||
form label{
|
||||
margin-top: 5%;
|
||||
}
|
||||
|
||||
105
AstuteSystem/target/astutesystem/doc/user-guide.jsp
Normal file
105
AstuteSystem/target/astutesystem/doc/user-guide.jsp
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
<html>
|
||||
<body>
|
||||
<head>
|
||||
<title>PM User Guide</title>
|
||||
<link rel="stylesheet" href="./css/theme.css">
|
||||
<link rel="stylesheet" href="./css/nav.css">
|
||||
<style type="text/css">
|
||||
h1, h3, h5 {
|
||||
font-family: "Times New Roman", Times, serif;
|
||||
color: #2196F3;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: "Times New Roman", Times, serif;
|
||||
background: lightgrey;
|
||||
}
|
||||
|
||||
dt {
|
||||
font-weight: bold;
|
||||
padding-left: 30px;
|
||||
font-family: "Times New Roman", Times, serif;
|
||||
color: #2196F3;
|
||||
}
|
||||
|
||||
dd {
|
||||
padding-left: 30px;
|
||||
}
|
||||
|
||||
.doc-div {
|
||||
margin-left: 14%;
|
||||
margin-right: 14%;
|
||||
margin-bottom: 3%;
|
||||
background: white;
|
||||
}
|
||||
|
||||
.card {
|
||||
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
|
||||
transition: 0.3s;
|
||||
padding: 5px;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<div class="doc-div card">
|
||||
<h1 align="center">Policy Machine Overview</h1>
|
||||
<p>Click <a href="./doc/PMUserGuide.pdf" target="_blank">here</a> for the Policy Machine User Guide</p>
|
||||
</div>
|
||||
|
||||
<div class="doc-div card">
|
||||
<h1 align="center">Policy Machine Entities</h1>
|
||||
<h3>Nodes</h3>
|
||||
<dl style="list-style-type: none">
|
||||
<dt>Policy Class</dt>
|
||||
<br>
|
||||
<dd>A Policy Class node is the base node for any policy. For example, the Role Based Access Control policy will have a Policy Class node called RBAC in which the policy is contained.</dd>
|
||||
<br>
|
||||
<dt>Object Attribute</dt>
|
||||
<br>
|
||||
<dd>An Object Attribure node is a container that can hold other Object Attrbibutes or objects, and are often the target of the policies that are defined by the Policy Class they are assigned to.
|
||||
For example, in a Multiple Layer Security (MLS) Policy Class, there may be an Object Attribute labeled "Top Secret". The nodes (Object Attributes or Objects) that are then assigned to this Object
|
||||
Attribute might be subjected to the policies defined by the MLS policy class on "Top Secret".</dd>
|
||||
<br>
|
||||
<dt>Object</dt>
|
||||
<br>
|
||||
<dd>An Object is a representation of data, whether the data is on a file system or in a schema.</dd>
|
||||
<br>
|
||||
<dt>User Attribute</dt>
|
||||
<br>
|
||||
<dd>A User Attribute node is a collection of one or many users.</dd>
|
||||
<br>
|
||||
<dt>User</dt>
|
||||
<br>
|
||||
<dd>A User node is a representation of a User of the Policy Machine.</dd>
|
||||
<br>
|
||||
<dt>Operation Set</dt>
|
||||
<br>
|
||||
<dd>An Operation Set node is a collection of Operations. This set is then used to connect a User Attribute to an Object Attribute, creating an association relationship in which the users that belong to the
|
||||
User Attribute are granted the rights in the Operation set on the Object Attribute. For example, if there is an Object Attribute called "Medical Records" and a User Attribute called "Doctors" and we want to give
|
||||
doctors the permission to read and write, we would create the association: "Doctor" ---> Operation Set{read, write} ---> "Medical Records".</dd>
|
||||
<br>
|
||||
</dl>
|
||||
|
||||
<h3>Deny Constraints</h3>
|
||||
<p>While Policies can be defined on tables and columns, there is still a need to restrict access at the record field level. For example, consider a table called "Employee Record" with the columns: Name, Phone Number, Salary and a User Bob.
|
||||
The Name and Phone Number fields may be public information available to everyone, however, the Salary field is private data and Bob can only read his own salary, no one elses. We can use a deny constraint to deny
|
||||
Bob the ability to read the column "Salary" instersected with the complement of his own Record. This would lead to Bob only being able to read the Salary field of his own record.</p>
|
||||
<h3>Assignments</h3>
|
||||
<p>Assignments are fundamental to the Policy Machine because they are how Policies are created and enforced.</p>
|
||||
<h3>Operations</h3>
|
||||
<p>Brief explanation of different kinds (class) of Operations. Describe resource vs admin</p>
|
||||
<h3>Policy Scripts</h3>
|
||||
Policy Scripts are another means of defining policies in the Policy Machine. For example, we can write a script that when a User is created, an Object Attribute called User Home is also created. We can then grant the new User the permissions
|
||||
read and write on that Object Attribute. This is just one example of using Policy Scripts. An in-depth documentation with example scripts is available <a href="./doc/policyScriptsDoc.pdf" target="_blank">here</a>.
|
||||
</div>
|
||||
<div class="doc-div card">
|
||||
<h1 align="center">Examples</h1>
|
||||
<p>Examples and use cases of Policy Machine calls</p>
|
||||
</div>
|
||||
<div class="doc-div card">
|
||||
<h1 align="center">Policy Machine API</h1>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
BIN
AstuteSystem/target/astutesystem/images/logo.png
Normal file
BIN
AstuteSystem/target/astutesystem/images/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.1 KiB |
18
AstuteSystem/target/astutesystem/images/nist-logo.svg
Normal file
18
AstuteSystem/target/astutesystem/images/nist-logo.svg
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="-237 385.7 109.7 29.3" style="enable-background:new -237 385.7 109.7 29.3;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#FFFFFF;}
|
||||
</style>
|
||||
<g>
|
||||
<g>
|
||||
<path class="st0" d="M-231,415h-6v-23.1c0,0,0-4.4,4.4-5.8c4-1.3,6.6,1.3,6.6,1.3l19.7,21.3c1,0.6,1.4,0,1.4-0.6v-22h6.1V409
|
||||
c0,1.9-1.6,4.4-4,5.3c-2.4,0.9-4.9,0.9-7.9-1.7l-18.5-20c-0.5-0.5-1.8-0.6-1.8,0.4L-231,415L-231,415z"/>
|
||||
<path class="st0" d="M-195,386.1h6.1v20.7c0,2.2,1.9,2.2,3.6,2.2h26.8c1.1,0,2.4-1.3,2.4-2.7c0-1.4-1.3-2.8-2.5-2.8H-176
|
||||
c-3,0.1-9.2-2.7-9.2-8.5c0-7.1,5.9-8.8,8.6-9h49.4v6.1h-12.3V415h-6v-22.9h-30.2c-2.9-0.2-4.9,4.7-0.2,5.4h18.6
|
||||
c2.8,0,7.4,2.4,7.5,8.4c0,6.1-3.6,9-7.5,9H-185c-4.5,0-6.2-1.1-7.8-2.5c-1.5-1.5-1.7-2.3-2.2-5.3L-195,386.1
|
||||
C-194.9,386.1-195,386.1-195,386.1z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.0 KiB |
3
AstuteSystem/target/astutesystem/index.html
Normal file
3
AstuteSystem/target/astutesystem/index.html
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
Welcome
|
||||
|
||||
Astute LLC
|
||||
Loading…
Reference in New Issue
Block a user