diff --git a/.classpath b/.classpath index d64b1ee..44a1bb7 100644 --- a/.classpath +++ b/.classpath @@ -1,13 +1,13 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/.project b/.project index eac9ff2..a648ce6 100644 --- a/.project +++ b/.project @@ -1,31 +1,31 @@ - - - RescueServer - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - + + + RescueServer + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature + org.eclipse.wst.jsdt.core.jsNature + + diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope index 76c2d63..92e2212 100644 --- a/.settings/.jsdtscope +++ b/.settings/.jsdtscope @@ -1,12 +1,12 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 99f26c0..4824b80 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 4dac6ae..154b942 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,14 +1,14 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 80a9556..4f65eb3 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index b60f65b..092f3bf 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/build/classes/app.properties b/build/classes/app.properties index 4e164a2..934fd6d 100644 --- a/build/classes/app.properties +++ b/build/classes/app.properties @@ -1,5 +1,5 @@ -AppDebug=true -AppTrace=true -AppParamHelper=cn.tsy.cas.idsse.rescue.helper.RescueParamHelper -AppListener=cn.tsy.cas.idsse.dsds.control.RescueInitializeListener +AppDebug=true +AppTrace=true +AppParamHelper=cn.tsy.cas.idsse.rescue.helper.RescueParamHelper +AppListener=cn.tsy.cas.idsse.dsds.control.RescueInitializeListener AppName=RescueServer \ No newline at end of file diff --git a/build/classes/cn/tsy/cas/idsse/rescue/control/RescueRegSampleControl.class b/build/classes/cn/tsy/cas/idsse/rescue/control/RescueRegSampleControl.class index 5813444..c492b32 100644 Binary files a/build/classes/cn/tsy/cas/idsse/rescue/control/RescueRegSampleControl.class and b/build/classes/cn/tsy/cas/idsse/rescue/control/RescueRegSampleControl.class differ diff --git a/build/classes/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.xml b/build/classes/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.xml index 3a347bf..8501c21 100644 --- a/build/classes/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.xml @@ -1,68 +1,68 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/build/classes/jdbc.properties b/build/classes/jdbc.properties index 887fcc1..66fbb9d 100644 --- a/build/classes/jdbc.properties +++ b/build/classes/jdbc.properties @@ -1,18 +1,18 @@ -#JdbcUrl=jdbc:mysql://116.211.2.76:65206/aigg2025?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true -#JdbcUser=root -#JdbcPassword=hm2022 - -JdbcUrl=jdbc:postgresql://1.95.42.191:5432/idsse_rescue -JdbcUser=postgres -JdbcPassword=a654321a - -#JdbcUrl=jdbc:mysql://1.95.42.191:3306/xacom_tk?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true -#JdbcUser=root -#JdbcPassword=a654321a -JdbcCheckouttimeout=30000 -JdbcMaxpoolsize=200 - -#test.JdbcDriverClass=org.sqlite.JDBC -#test.JdbcUrl=jdbc:sqlite://d:\\gopmas.db -#test.JdbcCheckouttimeout=30000 +#JdbcUrl=jdbc:mysql://116.211.2.76:65206/aigg2025?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true +#JdbcUser=root +#JdbcPassword=hm2022 + +JdbcUrl=jdbc:postgresql://1.95.42.191:5432/idsse_rescue +JdbcUser=postgres +JdbcPassword=a654321a + +#JdbcUrl=jdbc:mysql://1.95.42.191:3306/xacom_tk?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true +#JdbcUser=root +#JdbcPassword=a654321a +JdbcCheckouttimeout=30000 +JdbcMaxpoolsize=200 + +#test.JdbcDriverClass=org.sqlite.JDBC +#test.JdbcUrl=jdbc:sqlite://d:\\gopmas.db +#test.JdbcCheckouttimeout=30000 #test.JdbcMaxpoolsize=200 \ No newline at end of file diff --git a/src/main/data/database.sql b/src/main/data/database.sql index 555c147..1a4c6bc 100644 --- a/src/main/data/database.sql +++ b/src/main/data/database.sql @@ -1,9 +1,9 @@ -/* -PostgreSQL Backup -Database: idsse_rescue/public -Backup Time: 2025-10-31 16:28:00 -*/ - +/* +PostgreSQL Backup +Database: idsse_rescue/public +Backup Time: 2025-10-31 16:28:00 +*/ + DROP SEQUENCE IF EXISTS "public"."hme_frame_dept_dept_id_seq"; DROP SEQUENCE IF EXISTS "public"."hme_frame_optr_optr_id_seq"; DROP SEQUENCE IF EXISTS "public"."hme_frame_role_role_id_seq"; @@ -25,412 +25,412 @@ DROP TABLE IF EXISTS "public"."hme_frame_role_res"; DROP TABLE IF EXISTS "public"."rescue_reg"; DROP TABLE IF EXISTS "public"."rescue_reg_file"; DROP TABLE IF EXISTS "public"."rescue_reg_sample"; -CREATE SEQUENCE "hme_frame_dept_dept_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "hme_frame_dept_dept_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "hme_frame_optr_optr_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "hme_frame_optr_optr_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "hme_frame_role_role_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "hme_frame_role_role_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "rescue_file_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "rescue_file_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "rescue_reg_sample_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "rescue_reg_sample_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE SEQUENCE "rescue_reg_tsy_id_seq" -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 +CREATE SEQUENCE "rescue_reg_tsy_id_seq" +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 CACHE 1; -CREATE TABLE "hme_frame_dept" ( - "dept_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "dept_name" varchar(64) COLLATE "pg_catalog"."default", - "dept_desc" varchar(254) COLLATE "pg_catalog"."default", - "dept_pid" int4, - "dept_manager" varchar(254) COLLATE "pg_catalog"."default", - "dept_addr" varchar(255) COLLATE "pg_catalog"."default", - "dept_tel" varchar(64) COLLATE "pg_catalog"."default", - "dept_fax" varchar(64) COLLATE "pg_catalog"."default", - "dept_code" varchar(64) COLLATE "pg_catalog"."default", - "dept_level" int4, - "dept_param" varchar(256) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_dept" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_dept"."dept_id" IS '部门编号'; -COMMENT ON COLUMN "hme_frame_dept"."dept_name" IS '部门名称'; -COMMENT ON COLUMN "hme_frame_dept"."dept_desc" IS '备注信息'; -COMMENT ON COLUMN "hme_frame_dept"."dept_pid" IS '部门上级部门'; -COMMENT ON COLUMN "hme_frame_dept"."dept_manager" IS '部门经理'; -COMMENT ON COLUMN "hme_frame_dept"."dept_addr" IS '部门地址'; -COMMENT ON COLUMN "hme_frame_dept"."dept_tel" IS '部门联系电话'; -COMMENT ON COLUMN "hme_frame_dept"."dept_fax" IS '部门传真'; -COMMENT ON COLUMN "hme_frame_dept"."dept_code" IS '部门编号'; -COMMENT ON COLUMN "hme_frame_dept"."dept_level" IS '部门级别'; -COMMENT ON COLUMN "hme_frame_dept"."dept_param" IS '部门参数'; +CREATE TABLE "hme_frame_dept" ( + "dept_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "dept_name" varchar(64) COLLATE "pg_catalog"."default", + "dept_desc" varchar(254) COLLATE "pg_catalog"."default", + "dept_pid" int4, + "dept_manager" varchar(254) COLLATE "pg_catalog"."default", + "dept_addr" varchar(255) COLLATE "pg_catalog"."default", + "dept_tel" varchar(64) COLLATE "pg_catalog"."default", + "dept_fax" varchar(64) COLLATE "pg_catalog"."default", + "dept_code" varchar(64) COLLATE "pg_catalog"."default", + "dept_level" int4, + "dept_param" varchar(256) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_dept" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_dept"."dept_id" IS '部门编号'; +COMMENT ON COLUMN "hme_frame_dept"."dept_name" IS '部门名称'; +COMMENT ON COLUMN "hme_frame_dept"."dept_desc" IS '备注信息'; +COMMENT ON COLUMN "hme_frame_dept"."dept_pid" IS '部门上级部门'; +COMMENT ON COLUMN "hme_frame_dept"."dept_manager" IS '部门经理'; +COMMENT ON COLUMN "hme_frame_dept"."dept_addr" IS '部门地址'; +COMMENT ON COLUMN "hme_frame_dept"."dept_tel" IS '部门联系电话'; +COMMENT ON COLUMN "hme_frame_dept"."dept_fax" IS '部门传真'; +COMMENT ON COLUMN "hme_frame_dept"."dept_code" IS '部门编号'; +COMMENT ON COLUMN "hme_frame_dept"."dept_level" IS '部门级别'; +COMMENT ON COLUMN "hme_frame_dept"."dept_param" IS '部门参数'; COMMENT ON TABLE "hme_frame_dept" IS '系统表-部门信息'; -CREATE TABLE "hme_frame_dict" ( - "dict_name" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, - "dict_value" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, - "dict_text" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, - "dict_order" int4 -) -; -ALTER TABLE "hme_frame_dict" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_dict"."dict_name" IS '字典名称'; -COMMENT ON COLUMN "hme_frame_dict"."dict_value" IS '字典值'; -COMMENT ON COLUMN "hme_frame_dict"."dict_text" IS '字典中文名称'; -COMMENT ON COLUMN "hme_frame_dict"."dict_order" IS '字典排序'; +CREATE TABLE "hme_frame_dict" ( + "dict_name" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, + "dict_value" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, + "dict_text" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, + "dict_order" int4 +) +; +ALTER TABLE "hme_frame_dict" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_dict"."dict_name" IS '字典名称'; +COMMENT ON COLUMN "hme_frame_dict"."dict_value" IS '字典值'; +COMMENT ON COLUMN "hme_frame_dict"."dict_text" IS '字典中文名称'; +COMMENT ON COLUMN "hme_frame_dict"."dict_order" IS '字典排序'; COMMENT ON TABLE "hme_frame_dict" IS '系统表-字典定义'; -CREATE TABLE "hme_frame_dict_name" ( - "dict_name" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, - "dict_group" varchar(32) COLLATE "pg_catalog"."default", - "dict_note" varchar(128) COLLATE "pg_catalog"."default", - "dict_modify" varchar(1) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_dict_name" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_dict_name"."dict_name" IS '字典类型'; -COMMENT ON COLUMN "hme_frame_dict_name"."dict_group" IS '字典分离'; -COMMENT ON COLUMN "hme_frame_dict_name"."dict_note" IS '字典描述信息'; -COMMENT ON COLUMN "hme_frame_dict_name"."dict_modify" IS '是否运行修改'; +CREATE TABLE "hme_frame_dict_name" ( + "dict_name" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, + "dict_group" varchar(32) COLLATE "pg_catalog"."default", + "dict_note" varchar(128) COLLATE "pg_catalog"."default", + "dict_modify" varchar(1) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_dict_name" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_dict_name"."dict_name" IS '字典类型'; +COMMENT ON COLUMN "hme_frame_dict_name"."dict_group" IS '字典分离'; +COMMENT ON COLUMN "hme_frame_dict_name"."dict_note" IS '字典描述信息'; +COMMENT ON COLUMN "hme_frame_dict_name"."dict_modify" IS '是否运行修改'; COMMENT ON TABLE "hme_frame_dict_name" IS '系统表-字典类型定义'; -CREATE TABLE "hme_frame_language" ( - "lang_key" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, - "lang_client" varchar(1) COLLATE "pg_catalog"."default", - "lang_name" varchar(32) COLLATE "pg_catalog"."default", - "lang_ch" varchar(1024) COLLATE "pg_catalog"."default", - "lang_en" varchar(1024) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_language" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_language"."lang_key" IS '配置名称'; -COMMENT ON COLUMN "hme_frame_language"."lang_client" IS '是否是前端，0不是，1，是'; -COMMENT ON COLUMN "hme_frame_language"."lang_name" IS '配置说明'; -COMMENT ON COLUMN "hme_frame_language"."lang_ch" IS '中文'; -COMMENT ON COLUMN "hme_frame_language"."lang_en" IS '英文'; +CREATE TABLE "hme_frame_language" ( + "lang_key" varchar(128) COLLATE "pg_catalog"."default" NOT NULL, + "lang_client" varchar(1) COLLATE "pg_catalog"."default", + "lang_name" varchar(32) COLLATE "pg_catalog"."default", + "lang_ch" varchar(1024) COLLATE "pg_catalog"."default", + "lang_en" varchar(1024) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_language" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_language"."lang_key" IS '配置名称'; +COMMENT ON COLUMN "hme_frame_language"."lang_client" IS '是否是前端，0不是，1，是'; +COMMENT ON COLUMN "hme_frame_language"."lang_name" IS '配置说明'; +COMMENT ON COLUMN "hme_frame_language"."lang_ch" IS '中文'; +COMMENT ON COLUMN "hme_frame_language"."lang_en" IS '英文'; COMMENT ON TABLE "hme_frame_language" IS '系统表-语言定义'; -CREATE TABLE "hme_frame_optr" ( - "optr_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "optr_name" varchar(64) COLLATE "pg_catalog"."default", - "login_name" varchar(64) COLLATE "pg_catalog"."default", - "login_pass" varchar(128) COLLATE "pg_catalog"."default", - "optr_alias" varchar(32) COLLATE "pg_catalog"."default", - "optr_sex" varchar(32) COLLATE "pg_catalog"."default", - "optr_status" varchar(32) COLLATE "pg_catalog"."default", - "optr_email" varchar(128) COLLATE "pg_catalog"."default", - "optr_mobile" varchar(32) COLLATE "pg_catalog"."default", - "optr_tel" varchar(32) COLLATE "pg_catalog"."default", - "optr_addr" varchar(256) COLLATE "pg_catalog"."default", - "optr_fax" varchar(32) COLLATE "pg_catalog"."default", - "optr_dept" int4, - "optr_post" varchar(16) COLLATE "pg_catalog"."default", - "optr_level" int4, - "optr_desc" varchar(256) COLLATE "pg_catalog"."default", - "optr_image" varchar(256) COLLATE "pg_catalog"."default", - "optr_param" varchar(256) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_optr" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_optr"."optr_id" IS '内部编号'; -COMMENT ON COLUMN "hme_frame_optr"."optr_name" IS '操作员名称'; -COMMENT ON COLUMN "hme_frame_optr"."login_name" IS '登录名称，唯一'; -COMMENT ON COLUMN "hme_frame_optr"."login_pass" IS '登录密码,MD5加密'; -COMMENT ON COLUMN "hme_frame_optr"."optr_alias" IS '别名'; -COMMENT ON COLUMN "hme_frame_optr"."optr_sex" IS '操作员性别，FrameSex'; -COMMENT ON COLUMN "hme_frame_optr"."optr_status" IS '操作员状态，对应FrameStatus'; -COMMENT ON COLUMN "hme_frame_optr"."optr_email" IS '电子邮件地址'; -COMMENT ON COLUMN "hme_frame_optr"."optr_mobile" IS '联系电话'; -COMMENT ON COLUMN "hme_frame_optr"."optr_tel" IS '办公电话'; -COMMENT ON COLUMN "hme_frame_optr"."optr_addr" IS '联系地址'; -COMMENT ON COLUMN "hme_frame_optr"."optr_fax" IS '传真号码'; -COMMENT ON COLUMN "hme_frame_optr"."optr_dept" IS '部门编号'; -COMMENT ON COLUMN "hme_frame_optr"."optr_post" IS '邮政编码'; -COMMENT ON COLUMN "hme_frame_optr"."optr_level" IS '操作员级别'; -COMMENT ON COLUMN "hme_frame_optr"."optr_desc" IS '操作员备注信息'; -COMMENT ON COLUMN "hme_frame_optr"."optr_image" IS '操作员照片（存放路径）'; -COMMENT ON COLUMN "hme_frame_optr"."optr_param" IS '参数信息'; +CREATE TABLE "hme_frame_optr" ( + "optr_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "optr_name" varchar(64) COLLATE "pg_catalog"."default", + "login_name" varchar(64) COLLATE "pg_catalog"."default", + "login_pass" varchar(128) COLLATE "pg_catalog"."default", + "optr_alias" varchar(32) COLLATE "pg_catalog"."default", + "optr_sex" varchar(32) COLLATE "pg_catalog"."default", + "optr_status" varchar(32) COLLATE "pg_catalog"."default", + "optr_email" varchar(128) COLLATE "pg_catalog"."default", + "optr_mobile" varchar(32) COLLATE "pg_catalog"."default", + "optr_tel" varchar(32) COLLATE "pg_catalog"."default", + "optr_addr" varchar(256) COLLATE "pg_catalog"."default", + "optr_fax" varchar(32) COLLATE "pg_catalog"."default", + "optr_dept" int4, + "optr_post" varchar(16) COLLATE "pg_catalog"."default", + "optr_level" int4, + "optr_desc" varchar(256) COLLATE "pg_catalog"."default", + "optr_image" varchar(256) COLLATE "pg_catalog"."default", + "optr_param" varchar(256) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_optr" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_optr"."optr_id" IS '内部编号'; +COMMENT ON COLUMN "hme_frame_optr"."optr_name" IS '操作员名称'; +COMMENT ON COLUMN "hme_frame_optr"."login_name" IS '登录名称，唯一'; +COMMENT ON COLUMN "hme_frame_optr"."login_pass" IS '登录密码,MD5加密'; +COMMENT ON COLUMN "hme_frame_optr"."optr_alias" IS '别名'; +COMMENT ON COLUMN "hme_frame_optr"."optr_sex" IS '操作员性别，FrameSex'; +COMMENT ON COLUMN "hme_frame_optr"."optr_status" IS '操作员状态，对应FrameStatus'; +COMMENT ON COLUMN "hme_frame_optr"."optr_email" IS '电子邮件地址'; +COMMENT ON COLUMN "hme_frame_optr"."optr_mobile" IS '联系电话'; +COMMENT ON COLUMN "hme_frame_optr"."optr_tel" IS '办公电话'; +COMMENT ON COLUMN "hme_frame_optr"."optr_addr" IS '联系地址'; +COMMENT ON COLUMN "hme_frame_optr"."optr_fax" IS '传真号码'; +COMMENT ON COLUMN "hme_frame_optr"."optr_dept" IS '部门编号'; +COMMENT ON COLUMN "hme_frame_optr"."optr_post" IS '邮政编码'; +COMMENT ON COLUMN "hme_frame_optr"."optr_level" IS '操作员级别'; +COMMENT ON COLUMN "hme_frame_optr"."optr_desc" IS '操作员备注信息'; +COMMENT ON COLUMN "hme_frame_optr"."optr_image" IS '操作员照片（存放路径）'; +COMMENT ON COLUMN "hme_frame_optr"."optr_param" IS '参数信息'; COMMENT ON TABLE "hme_frame_optr" IS '系统表-操作员信息'; -CREATE TABLE "hme_frame_optr_log" ( - "log_id" int4 NOT NULL, - "optr_id" int4, - "login_name" varchar(32) COLLATE "pg_catalog"."default", - "log_type" varchar(32) COLLATE "pg_catalog"."default", - "log_time" timestamp(6), - "log_param" text COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_optr_log" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_optr_log"."log_id" IS '内部编号'; -COMMENT ON COLUMN "hme_frame_optr_log"."optr_id" IS '操作员编号'; -COMMENT ON COLUMN "hme_frame_optr_log"."login_name" IS '操作员名称'; -COMMENT ON COLUMN "hme_frame_optr_log"."log_type" IS '日志类型'; -COMMENT ON COLUMN "hme_frame_optr_log"."log_time" IS '记录日志时间'; -COMMENT ON COLUMN "hme_frame_optr_log"."log_param" IS '日志参数'; +CREATE TABLE "hme_frame_optr_log" ( + "log_id" int4 NOT NULL, + "optr_id" int4, + "login_name" varchar(32) COLLATE "pg_catalog"."default", + "log_type" varchar(32) COLLATE "pg_catalog"."default", + "log_time" timestamp(6), + "log_param" text COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_optr_log" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_optr_log"."log_id" IS '内部编号'; +COMMENT ON COLUMN "hme_frame_optr_log"."optr_id" IS '操作员编号'; +COMMENT ON COLUMN "hme_frame_optr_log"."login_name" IS '操作员名称'; +COMMENT ON COLUMN "hme_frame_optr_log"."log_type" IS '日志类型'; +COMMENT ON COLUMN "hme_frame_optr_log"."log_time" IS '记录日志时间'; +COMMENT ON COLUMN "hme_frame_optr_log"."log_param" IS '日志参数'; COMMENT ON TABLE "hme_frame_optr_log" IS '系统表-操作员日志表'; -CREATE TABLE "hme_frame_optr_login" ( - "log_id" int4 NOT NULL, - "optr_id" int4, - "login_name" varchar(64) COLLATE "pg_catalog"."default", - "login_time" timestamp(6), - "browser_type" varchar(128) COLLATE "pg_catalog"."default", - "browser_version" varchar(256) COLLATE "pg_catalog"."default", - "platform_type" varchar(256) COLLATE "pg_catalog"."default", - "platform_series" varchar(256) COLLATE "pg_catalog"."default", - "platform_version" varchar(256) COLLATE "pg_catalog"."default", - "login_addr" varchar(256) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_optr_login" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_optr_login"."log_id" IS '登录编号 '; -COMMENT ON COLUMN "hme_frame_optr_login"."optr_id" IS '操作员编号'; -COMMENT ON COLUMN "hme_frame_optr_login"."login_name" IS '操作员名称'; -COMMENT ON COLUMN "hme_frame_optr_login"."login_time" IS '登录时间'; -COMMENT ON COLUMN "hme_frame_optr_login"."browser_type" IS '浏览器类型'; -COMMENT ON COLUMN "hme_frame_optr_login"."browser_version" IS '浏览器版本'; -COMMENT ON COLUMN "hme_frame_optr_login"."platform_type" IS '操作系统平台'; -COMMENT ON COLUMN "hme_frame_optr_login"."platform_series" IS '操作系统类型'; -COMMENT ON COLUMN "hme_frame_optr_login"."platform_version" IS '操作系统版本'; -COMMENT ON COLUMN "hme_frame_optr_login"."login_addr" IS '登录地址'; +CREATE TABLE "hme_frame_optr_login" ( + "log_id" int4 NOT NULL, + "optr_id" int4, + "login_name" varchar(64) COLLATE "pg_catalog"."default", + "login_time" timestamp(6), + "browser_type" varchar(128) COLLATE "pg_catalog"."default", + "browser_version" varchar(256) COLLATE "pg_catalog"."default", + "platform_type" varchar(256) COLLATE "pg_catalog"."default", + "platform_series" varchar(256) COLLATE "pg_catalog"."default", + "platform_version" varchar(256) COLLATE "pg_catalog"."default", + "login_addr" varchar(256) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_optr_login" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_optr_login"."log_id" IS '登录编号 '; +COMMENT ON COLUMN "hme_frame_optr_login"."optr_id" IS '操作员编号'; +COMMENT ON COLUMN "hme_frame_optr_login"."login_name" IS '操作员名称'; +COMMENT ON COLUMN "hme_frame_optr_login"."login_time" IS '登录时间'; +COMMENT ON COLUMN "hme_frame_optr_login"."browser_type" IS '浏览器类型'; +COMMENT ON COLUMN "hme_frame_optr_login"."browser_version" IS '浏览器版本'; +COMMENT ON COLUMN "hme_frame_optr_login"."platform_type" IS '操作系统平台'; +COMMENT ON COLUMN "hme_frame_optr_login"."platform_series" IS '操作系统类型'; +COMMENT ON COLUMN "hme_frame_optr_login"."platform_version" IS '操作系统版本'; +COMMENT ON COLUMN "hme_frame_optr_login"."login_addr" IS '登录地址'; COMMENT ON TABLE "hme_frame_optr_login" IS '系统表-操作员登录日志'; -CREATE TABLE "hme_frame_optr_role" ( - "optr_id" int4 NOT NULL, - "role_id" int4 NOT NULL -) -; -ALTER TABLE "hme_frame_optr_role" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_optr_role"."optr_id" IS '操作员ID'; -COMMENT ON COLUMN "hme_frame_optr_role"."role_id" IS '角色ID'; +CREATE TABLE "hme_frame_optr_role" ( + "optr_id" int4 NOT NULL, + "role_id" int4 NOT NULL +) +; +ALTER TABLE "hme_frame_optr_role" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_optr_role"."optr_id" IS '操作员ID'; +COMMENT ON COLUMN "hme_frame_optr_role"."role_id" IS '角色ID'; COMMENT ON TABLE "hme_frame_optr_role" IS '系统表-操作员所属角色表'; -CREATE TABLE "hme_frame_param" ( - "param_name" varchar(512) COLLATE "pg_catalog"."default" NOT NULL, - "param_value" varchar(1024) COLLATE "pg_catalog"."default", - "param_status" varchar(1) COLLATE "pg_catalog"."default", - "param_appname" varchar(32) COLLATE "pg_catalog"."default", - "param_note" varchar(1024) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_param" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_param"."param_name" IS '参数名称'; -COMMENT ON COLUMN "hme_frame_param"."param_value" IS '参数值'; -COMMENT ON COLUMN "hme_frame_param"."param_status" IS '参数状态，是否启用，0禁用，1启用'; -COMMENT ON COLUMN "hme_frame_param"."param_appname" IS '是否属于哪个软件专用，如果为空，所有软件专用'; -COMMENT ON COLUMN "hme_frame_param"."param_note" IS '参数描述，尽可能描述清楚'; +CREATE TABLE "hme_frame_param" ( + "param_name" varchar(512) COLLATE "pg_catalog"."default" NOT NULL, + "param_value" varchar(1024) COLLATE "pg_catalog"."default", + "param_status" varchar(1) COLLATE "pg_catalog"."default", + "param_appname" varchar(32) COLLATE "pg_catalog"."default", + "param_note" varchar(1024) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_param" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_param"."param_name" IS '参数名称'; +COMMENT ON COLUMN "hme_frame_param"."param_value" IS '参数值'; +COMMENT ON COLUMN "hme_frame_param"."param_status" IS '参数状态，是否启用，0禁用，1启用'; +COMMENT ON COLUMN "hme_frame_param"."param_appname" IS '是否属于哪个软件专用，如果为空，所有软件专用'; +COMMENT ON COLUMN "hme_frame_param"."param_note" IS '参数描述，尽可能描述清楚'; COMMENT ON TABLE "hme_frame_param" IS '系统表-系统参数定义'; -CREATE TABLE "hme_frame_res" ( - "res_id" int4 NOT NULL, - "res_name" varchar(64) COLLATE "pg_catalog"."default", - "res_alias" varchar(64) COLLATE "pg_catalog"."default", - "res_url" varchar(128) COLLATE "pg_catalog"."default", - "res_pid" int4, - "res_level" int4, - "res_type" varchar(32) COLLATE "pg_catalog"."default", - "res_css" varchar(128) COLLATE "pg_catalog"."default", - "res_status" varchar(1) COLLATE "pg_catalog"."default", - "res_order" int4, - "res_note" varchar(512) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_res" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_res"."res_id" IS '内部编号'; -COMMENT ON COLUMN "hme_frame_res"."res_name" IS '资源名称'; -COMMENT ON COLUMN "hme_frame_res"."res_alias" IS '别名，用于前端权限控制'; -COMMENT ON COLUMN "hme_frame_res"."res_url" IS '资源的地址'; -COMMENT ON COLUMN "hme_frame_res"."res_pid" IS '资源上级ID'; -COMMENT ON COLUMN "hme_frame_res"."res_level" IS '资源级别'; -COMMENT ON COLUMN "hme_frame_res"."res_type" IS '资源类型,Menu,Fun'; -COMMENT ON COLUMN "hme_frame_res"."res_css" IS '资源的样式信息'; -COMMENT ON COLUMN "hme_frame_res"."res_status" IS '资源状态'; -COMMENT ON COLUMN "hme_frame_res"."res_order" IS '排序'; -COMMENT ON COLUMN "hme_frame_res"."res_note" IS '备注信息'; +CREATE TABLE "hme_frame_res" ( + "res_id" int4 NOT NULL, + "res_name" varchar(64) COLLATE "pg_catalog"."default", + "res_alias" varchar(64) COLLATE "pg_catalog"."default", + "res_url" varchar(128) COLLATE "pg_catalog"."default", + "res_pid" int4, + "res_level" int4, + "res_type" varchar(32) COLLATE "pg_catalog"."default", + "res_css" varchar(128) COLLATE "pg_catalog"."default", + "res_status" varchar(1) COLLATE "pg_catalog"."default", + "res_order" int4, + "res_note" varchar(512) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_res" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_res"."res_id" IS '内部编号'; +COMMENT ON COLUMN "hme_frame_res"."res_name" IS '资源名称'; +COMMENT ON COLUMN "hme_frame_res"."res_alias" IS '别名，用于前端权限控制'; +COMMENT ON COLUMN "hme_frame_res"."res_url" IS '资源的地址'; +COMMENT ON COLUMN "hme_frame_res"."res_pid" IS '资源上级ID'; +COMMENT ON COLUMN "hme_frame_res"."res_level" IS '资源级别'; +COMMENT ON COLUMN "hme_frame_res"."res_type" IS '资源类型,Menu,Fun'; +COMMENT ON COLUMN "hme_frame_res"."res_css" IS '资源的样式信息'; +COMMENT ON COLUMN "hme_frame_res"."res_status" IS '资源状态'; +COMMENT ON COLUMN "hme_frame_res"."res_order" IS '排序'; +COMMENT ON COLUMN "hme_frame_res"."res_note" IS '备注信息'; COMMENT ON TABLE "hme_frame_res" IS '系统表-资源定义'; -CREATE TABLE "hme_frame_role" ( - "role_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "role_name" varchar(64) COLLATE "pg_catalog"."default", - "role_status" varchar(1) COLLATE "pg_catalog"."default", - "role_group" varchar(32) COLLATE "pg_catalog"."default", - "home_homepage" varchar(256) COLLATE "pg_catalog"."default", - "role_note" varchar(512) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "hme_frame_role" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_role"."role_id" IS '角色内部编号'; -COMMENT ON COLUMN "hme_frame_role"."role_name" IS '角色名称'; -COMMENT ON COLUMN "hme_frame_role"."role_status" IS '角色状态'; -COMMENT ON COLUMN "hme_frame_role"."role_group" IS '角色类型：扩展用'; -COMMENT ON COLUMN "hme_frame_role"."home_homepage" IS '角色主页'; -COMMENT ON COLUMN "hme_frame_role"."role_note" IS '角色说明'; +CREATE TABLE "hme_frame_role" ( + "role_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "role_name" varchar(64) COLLATE "pg_catalog"."default", + "role_status" varchar(1) COLLATE "pg_catalog"."default", + "role_group" varchar(32) COLLATE "pg_catalog"."default", + "home_homepage" varchar(256) COLLATE "pg_catalog"."default", + "role_note" varchar(512) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "hme_frame_role" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_role"."role_id" IS '角色内部编号'; +COMMENT ON COLUMN "hme_frame_role"."role_name" IS '角色名称'; +COMMENT ON COLUMN "hme_frame_role"."role_status" IS '角色状态'; +COMMENT ON COLUMN "hme_frame_role"."role_group" IS '角色类型：扩展用'; +COMMENT ON COLUMN "hme_frame_role"."home_homepage" IS '角色主页'; +COMMENT ON COLUMN "hme_frame_role"."role_note" IS '角色说明'; COMMENT ON TABLE "hme_frame_role" IS '系统表-角色定义'; -CREATE TABLE "hme_frame_role_res" ( - "role_id" int4 NOT NULL, - "res_id" int4 NOT NULL -) -; -ALTER TABLE "hme_frame_role_res" OWNER TO "postgres"; -COMMENT ON COLUMN "hme_frame_role_res"."role_id" IS '角色内部编号'; -COMMENT ON COLUMN "hme_frame_role_res"."res_id" IS '资源内部编号'; +CREATE TABLE "hme_frame_role_res" ( + "role_id" int4 NOT NULL, + "res_id" int4 NOT NULL +) +; +ALTER TABLE "hme_frame_role_res" OWNER TO "postgres"; +COMMENT ON COLUMN "hme_frame_role_res"."role_id" IS '角色内部编号'; +COMMENT ON COLUMN "hme_frame_role_res"."res_id" IS '资源内部编号'; COMMENT ON TABLE "hme_frame_role_res" IS '系统表-角色拥有的资源定义'; -CREATE TABLE "rescue_reg" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "rescue_status" varchar(32) COLLATE "pg_catalog"."default", - "rescue_status_time" timestamp(6), - "rescue_status_note" varchar(1024) COLLATE "pg_catalog"."default", - "rescue_type" varchar(32) COLLATE "pg_catalog"."default", - "rescue_code" varchar(64) COLLATE "pg_catalog"."default", - "rescue_target_type" varchar(64) COLLATE "pg_catalog"."default", - "rescue_target_name" varchar(128) COLLATE "pg_catalog"."default", - "rescue_target_lon" varchar(32) COLLATE "pg_catalog"."default", - "rescue_target_lat" varchar(32) COLLATE "pg_catalog"."default", - "rescue_target_radius" varchar(32) COLLATE "pg_catalog"."default", - "rescue_target_width" varchar(32) COLLATE "pg_catalog"."default", - "rescue_target_length" varchar(32) COLLATE "pg_catalog"."default", - "rescue_target_height" varchar(32) COLLATE "pg_catalog"."default", - "rescue_air_weight" varchar(32) COLLATE "pg_catalog"."default", - "rescue_water_weight" varchar(32) COLLATE "pg_catalog"."default", - "rescue_water_depth" varchar(32) COLLATE "pg_catalog"."default", - "rescue_target_price" varchar(32) COLLATE "pg_catalog"."default", - "rescue_response_level" varchar(32) COLLATE "pg_catalog"."default", - "rescue_secrecy" varchar(32) COLLATE "pg_catalog"."default", - "rescue_unit" varchar(32) COLLATE "pg_catalog"."default", - "rescue_response_day" varchar(32) COLLATE "pg_catalog"."default", - "fill_time" timestamp(6), - "fill_person" varchar(128) COLLATE "pg_catalog"."default", - "fill_tel" varchar(128) COLLATE "pg_catalog"."default", - "rescue_note" varchar(2000) COLLATE "pg_catalog"."default", - "fill_note" varchar(2000) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "rescue_reg" OWNER TO "postgres"; -COMMENT ON COLUMN "rescue_reg"."tsy_id" IS 'rescue'; -COMMENT ON COLUMN "rescue_reg"."rescue_status" IS '状态信息'; -COMMENT ON COLUMN "rescue_reg"."rescue_status_time" IS '状态变更时间'; -COMMENT ON COLUMN "rescue_reg"."rescue_status_note" IS '状态变更说明'; -COMMENT ON COLUMN "rescue_reg"."rescue_type" IS '应急搜捞：SAR 专项调查：SI'; -COMMENT ON COLUMN "rescue_reg"."rescue_code" IS '任务类型_目标类别_总序列号:SAR_Wreck_075'; -COMMENT ON COLUMN "rescue_reg"."rescue_target_type" IS '如果未知，可填写未知大型沉物：Wreck、锚系类目标Mooring、非合作方目标NCT、其他Other'; -COMMENT ON COLUMN "rescue_reg"."rescue_target_name" IS '目标类别按字典管理，分成四大类：大型沉物、锚系类目标、非合作方目标、其他，具体目标名称手动录入 -'; -COMMENT ON COLUMN "rescue_reg"."rescue_target_lon" IS '给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（经度）'; -COMMENT ON COLUMN "rescue_reg"."rescue_target_lat" IS '给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（纬度）'; -COMMENT ON COLUMN "rescue_reg"."rescue_target_radius" IS '给定搜寻范围半径'; -COMMENT ON COLUMN "rescue_reg"."rescue_target_width" IS '宽度（单位米）'; -COMMENT ON COLUMN "rescue_reg"."rescue_target_length" IS '长度（单位米）'; -COMMENT ON COLUMN "rescue_reg"."rescue_target_height" IS '高度（单位米）'; -COMMENT ON COLUMN "rescue_reg"."rescue_air_weight" IS '搜寻处置目标重量（空气中）kg/吨'; -COMMENT ON COLUMN "rescue_reg"."rescue_water_weight" IS '搜寻处置目标重量（水中）kg/吨'; -COMMENT ON COLUMN "rescue_reg"."rescue_water_depth" IS '搜寻处置目标水深（米）'; -COMMENT ON COLUMN "rescue_reg"."rescue_target_price" IS '搜寻处置目标预估价值 -'; -COMMENT ON COLUMN "rescue_reg"."rescue_response_level" IS '快速响应等级 -'; -COMMENT ON COLUMN "rescue_reg"."rescue_secrecy" IS '是否涉密 -'; -COMMENT ON COLUMN "rescue_reg"."rescue_unit" IS '搜捞目标的所属单位，手动录入 -'; -COMMENT ON COLUMN "rescue_reg"."rescue_response_day" IS '快速响应时间要求,比如说最晚10天就要捞上来，手动录入天数'; -COMMENT ON COLUMN "rescue_reg"."fill_time" IS '填报时间 -'; -COMMENT ON COLUMN "rescue_reg"."fill_person" IS '联系人信息 -'; -COMMENT ON COLUMN "rescue_reg"."fill_tel" IS '填报电话'; -COMMENT ON COLUMN "rescue_reg"."rescue_note" IS '备注'; -COMMENT ON COLUMN "rescue_reg"."fill_note" IS '填报说明'; +CREATE TABLE "rescue_reg" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "rescue_status" varchar(32) COLLATE "pg_catalog"."default", + "rescue_status_time" timestamp(6), + "rescue_status_note" varchar(1024) COLLATE "pg_catalog"."default", + "rescue_type" varchar(32) COLLATE "pg_catalog"."default", + "rescue_code" varchar(64) COLLATE "pg_catalog"."default", + "rescue_target_type" varchar(64) COLLATE "pg_catalog"."default", + "rescue_target_name" varchar(128) COLLATE "pg_catalog"."default", + "rescue_target_lon" varchar(32) COLLATE "pg_catalog"."default", + "rescue_target_lat" varchar(32) COLLATE "pg_catalog"."default", + "rescue_target_radius" varchar(32) COLLATE "pg_catalog"."default", + "rescue_target_width" varchar(32) COLLATE "pg_catalog"."default", + "rescue_target_length" varchar(32) COLLATE "pg_catalog"."default", + "rescue_target_height" varchar(32) COLLATE "pg_catalog"."default", + "rescue_air_weight" varchar(32) COLLATE "pg_catalog"."default", + "rescue_water_weight" varchar(32) COLLATE "pg_catalog"."default", + "rescue_water_depth" varchar(32) COLLATE "pg_catalog"."default", + "rescue_target_price" varchar(32) COLLATE "pg_catalog"."default", + "rescue_response_level" varchar(32) COLLATE "pg_catalog"."default", + "rescue_secrecy" varchar(32) COLLATE "pg_catalog"."default", + "rescue_unit" varchar(32) COLLATE "pg_catalog"."default", + "rescue_response_day" varchar(32) COLLATE "pg_catalog"."default", + "fill_time" timestamp(6), + "fill_person" varchar(128) COLLATE "pg_catalog"."default", + "fill_tel" varchar(128) COLLATE "pg_catalog"."default", + "rescue_note" varchar(2000) COLLATE "pg_catalog"."default", + "fill_note" varchar(2000) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "rescue_reg" OWNER TO "postgres"; +COMMENT ON COLUMN "rescue_reg"."tsy_id" IS 'rescue'; +COMMENT ON COLUMN "rescue_reg"."rescue_status" IS '状态信息'; +COMMENT ON COLUMN "rescue_reg"."rescue_status_time" IS '状态变更时间'; +COMMENT ON COLUMN "rescue_reg"."rescue_status_note" IS '状态变更说明'; +COMMENT ON COLUMN "rescue_reg"."rescue_type" IS '应急搜捞：SAR 专项调查：SI'; +COMMENT ON COLUMN "rescue_reg"."rescue_code" IS '任务类型_目标类别_总序列号:SAR_Wreck_075'; +COMMENT ON COLUMN "rescue_reg"."rescue_target_type" IS '如果未知，可填写未知大型沉物：Wreck、锚系类目标Mooring、非合作方目标NCT、其他Other'; +COMMENT ON COLUMN "rescue_reg"."rescue_target_name" IS '目标类别按字典管理，分成四大类：大型沉物、锚系类目标、非合作方目标、其他，具体目标名称手动录入 +'; +COMMENT ON COLUMN "rescue_reg"."rescue_target_lon" IS '给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（经度）'; +COMMENT ON COLUMN "rescue_reg"."rescue_target_lat" IS '给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（纬度）'; +COMMENT ON COLUMN "rescue_reg"."rescue_target_radius" IS '给定搜寻范围半径'; +COMMENT ON COLUMN "rescue_reg"."rescue_target_width" IS '宽度（单位米）'; +COMMENT ON COLUMN "rescue_reg"."rescue_target_length" IS '长度（单位米）'; +COMMENT ON COLUMN "rescue_reg"."rescue_target_height" IS '高度（单位米）'; +COMMENT ON COLUMN "rescue_reg"."rescue_air_weight" IS '搜寻处置目标重量（空气中）kg/吨'; +COMMENT ON COLUMN "rescue_reg"."rescue_water_weight" IS '搜寻处置目标重量（水中）kg/吨'; +COMMENT ON COLUMN "rescue_reg"."rescue_water_depth" IS '搜寻处置目标水深（米）'; +COMMENT ON COLUMN "rescue_reg"."rescue_target_price" IS '搜寻处置目标预估价值 +'; +COMMENT ON COLUMN "rescue_reg"."rescue_response_level" IS '快速响应等级 +'; +COMMENT ON COLUMN "rescue_reg"."rescue_secrecy" IS '是否涉密 +'; +COMMENT ON COLUMN "rescue_reg"."rescue_unit" IS '搜捞目标的所属单位，手动录入 +'; +COMMENT ON COLUMN "rescue_reg"."rescue_response_day" IS '快速响应时间要求,比如说最晚10天就要捞上来，手动录入天数'; +COMMENT ON COLUMN "rescue_reg"."fill_time" IS '填报时间 +'; +COMMENT ON COLUMN "rescue_reg"."fill_person" IS '联系人信息 +'; +COMMENT ON COLUMN "rescue_reg"."fill_tel" IS '填报电话'; +COMMENT ON COLUMN "rescue_reg"."rescue_note" IS '备注'; +COMMENT ON COLUMN "rescue_reg"."fill_note" IS '填报说明'; COMMENT ON TABLE "rescue_reg" IS '应急搜救任务'; -CREATE TABLE "rescue_reg_file" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "rescue_id" int4, - "file_org_name" varchar(256) COLLATE "pg_catalog"."default", - "file_real_name" varchar(256) COLLATE "pg_catalog"."default", - "file_path" varchar(256) COLLATE "pg_catalog"."default", - "file_length" varchar(32) COLLATE "pg_catalog"."default", - "file_note" varchar(512) COLLATE "pg_catalog"."default" -) -; -ALTER TABLE "rescue_reg_file" OWNER TO "postgres"; -COMMENT ON COLUMN "rescue_reg_file"."rescue_id" IS '应急编号'; -COMMENT ON COLUMN "rescue_reg_file"."file_org_name" IS '附件原始名称'; -COMMENT ON COLUMN "rescue_reg_file"."file_real_name" IS '附件真实名称'; -COMMENT ON COLUMN "rescue_reg_file"."file_path" IS '全路径'; -COMMENT ON COLUMN "rescue_reg_file"."file_length" IS '文件大小'; -COMMENT ON COLUMN "rescue_reg_file"."file_note" IS '备注信息'; +CREATE TABLE "rescue_reg_file" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "rescue_id" int4, + "file_org_name" varchar(256) COLLATE "pg_catalog"."default", + "file_real_name" varchar(256) COLLATE "pg_catalog"."default", + "file_path" varchar(256) COLLATE "pg_catalog"."default", + "file_length" varchar(32) COLLATE "pg_catalog"."default", + "file_note" varchar(512) COLLATE "pg_catalog"."default" +) +; +ALTER TABLE "rescue_reg_file" OWNER TO "postgres"; +COMMENT ON COLUMN "rescue_reg_file"."rescue_id" IS '应急编号'; +COMMENT ON COLUMN "rescue_reg_file"."file_org_name" IS '附件原始名称'; +COMMENT ON COLUMN "rescue_reg_file"."file_real_name" IS '附件真实名称'; +COMMENT ON COLUMN "rescue_reg_file"."file_path" IS '全路径'; +COMMENT ON COLUMN "rescue_reg_file"."file_length" IS '文件大小'; +COMMENT ON COLUMN "rescue_reg_file"."file_note" IS '备注信息'; COMMENT ON TABLE "rescue_reg_file" IS '应急救援：附件信息'; -CREATE TABLE "rescue_reg_sample" ( - "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( -INCREMENT 1 -MINVALUE 1 -MAXVALUE 2147483647 -START 1 -), - "rescue_id" int4, - "voyage_id" int4, - "voyage_name" varchar(255) COLLATE "pg_catalog"."default", - "dataset_id" int4, - "dataset_name" varchar(255) COLLATE "pg_catalog"."default", - "sample_id" int4, - "sample_name" varchar(128) COLLATE "pg_catalog"."default", - "conver_area" int4, - "create_time" timestamp(6), - "voyage_mileage" int4, - "diving_sn" varchar(256) COLLATE "pg_catalog"."default", - "voyage_days" int4 -) -; -ALTER TABLE "rescue_reg_sample" OWNER TO "postgres"; -COMMENT ON COLUMN "rescue_reg_sample"."rescue_id" IS '应急救援编号'; -COMMENT ON COLUMN "rescue_reg_sample"."voyage_id" IS '航次编号'; -COMMENT ON COLUMN "rescue_reg_sample"."voyage_name" IS '航次名称'; -COMMENT ON COLUMN "rescue_reg_sample"."dataset_id" IS '数据集id'; -COMMENT ON COLUMN "rescue_reg_sample"."dataset_name" IS '样品集名称'; -COMMENT ON COLUMN "rescue_reg_sample"."sample_id" IS '样品id'; -COMMENT ON COLUMN "rescue_reg_sample"."sample_name" IS '样品名称'; -COMMENT ON COLUMN "rescue_reg_sample"."conver_area" IS '覆盖面积'; -COMMENT ON COLUMN "rescue_reg_sample"."create_time" IS '关联日期'; -COMMENT ON COLUMN "rescue_reg_sample"."voyage_mileage" IS '航线里程'; -COMMENT ON COLUMN "rescue_reg_sample"."diving_sn" IS '潜次号'; +CREATE TABLE "rescue_reg_sample" ( + "tsy_id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY ( +INCREMENT 1 +MINVALUE 1 +MAXVALUE 2147483647 +START 1 +), + "rescue_id" int4, + "voyage_id" int4, + "voyage_name" varchar(255) COLLATE "pg_catalog"."default", + "dataset_id" int4, + "dataset_name" varchar(255) COLLATE "pg_catalog"."default", + "sample_id" int4, + "sample_name" varchar(128) COLLATE "pg_catalog"."default", + "conver_area" int4, + "create_time" timestamp(6), + "voyage_mileage" int4, + "diving_sn" varchar(256) COLLATE "pg_catalog"."default", + "voyage_days" int4 +) +; +ALTER TABLE "rescue_reg_sample" OWNER TO "postgres"; +COMMENT ON COLUMN "rescue_reg_sample"."rescue_id" IS '应急救援编号'; +COMMENT ON COLUMN "rescue_reg_sample"."voyage_id" IS '航次编号'; +COMMENT ON COLUMN "rescue_reg_sample"."voyage_name" IS '航次名称'; +COMMENT ON COLUMN "rescue_reg_sample"."dataset_id" IS '数据集id'; +COMMENT ON COLUMN "rescue_reg_sample"."dataset_name" IS '样品集名称'; +COMMENT ON COLUMN "rescue_reg_sample"."sample_id" IS '样品id'; +COMMENT ON COLUMN "rescue_reg_sample"."sample_name" IS '样品名称'; +COMMENT ON COLUMN "rescue_reg_sample"."conver_area" IS '覆盖面积'; +COMMENT ON COLUMN "rescue_reg_sample"."create_time" IS '关联日期'; +COMMENT ON COLUMN "rescue_reg_sample"."voyage_mileage" IS '航线里程'; +COMMENT ON COLUMN "rescue_reg_sample"."diving_sn" IS '潜次号'; COMMENT ON COLUMN "rescue_reg_sample"."voyage_days" IS '航线天数'; BEGIN; LOCK TABLE "public"."hme_frame_dept" IN SHARE MODE; @@ -507,8 +507,8 @@ ALTER TABLE "hme_frame_dict" ADD CONSTRAINT "hme_frame_dict_pkey" PRIMARY KEY (" ALTER TABLE "hme_frame_dict_name" ADD CONSTRAINT "hme_frame_dict_name_pkey" PRIMARY KEY ("dict_name"); ALTER TABLE "hme_frame_language" ADD CONSTRAINT "hme_frame_language_pkey" PRIMARY KEY ("lang_key"); ALTER TABLE "hme_frame_optr" ADD CONSTRAINT "hme_frame_optr_pkey" PRIMARY KEY ("optr_id"); -CREATE UNIQUE INDEX "inx_frame_optr_login_name" ON "hme_frame_optr" USING btree ( - "login_name" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST +CREATE UNIQUE INDEX "inx_frame_optr_login_name" ON "hme_frame_optr" USING btree ( + "login_name" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST ); ALTER TABLE "hme_frame_optr_log" ADD CONSTRAINT "hme_frame_optr_log_pkey" PRIMARY KEY ("log_id"); ALTER TABLE "hme_frame_optr_login" ADD CONSTRAINT "hme_frame_optr_login_pkey" PRIMARY KEY ("log_id"); @@ -520,27 +520,27 @@ ALTER TABLE "hme_frame_role_res" ADD CONSTRAINT "hme_frame_role_res_pkey" PRIMAR ALTER TABLE "rescue_reg" ADD CONSTRAINT "rescue_reg_pkey" PRIMARY KEY ("tsy_id"); ALTER TABLE "rescue_reg_file" ADD CONSTRAINT "rescue_file_pkey" PRIMARY KEY ("tsy_id"); ALTER TABLE "rescue_reg_sample" ADD CONSTRAINT "rescue_reg_sample_pkey" PRIMARY KEY ("tsy_id"); -ALTER SEQUENCE "hme_frame_dept_dept_id_seq" +ALTER SEQUENCE "hme_frame_dept_dept_id_seq" OWNED BY "hme_frame_dept"."dept_id"; SELECT setval('"hme_frame_dept_dept_id_seq"', 2, false); ALTER SEQUENCE "hme_frame_dept_dept_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "hme_frame_optr_optr_id_seq" +ALTER SEQUENCE "hme_frame_optr_optr_id_seq" OWNED BY "hme_frame_optr"."optr_id"; SELECT setval('"hme_frame_optr_optr_id_seq"', 6, true); ALTER SEQUENCE "hme_frame_optr_optr_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "hme_frame_role_role_id_seq" +ALTER SEQUENCE "hme_frame_role_role_id_seq" OWNED BY "hme_frame_role"."role_id"; SELECT setval('"hme_frame_role_role_id_seq"', 4, true); ALTER SEQUENCE "hme_frame_role_role_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "rescue_file_tsy_id_seq" +ALTER SEQUENCE "rescue_file_tsy_id_seq" OWNED BY "rescue_reg_file"."tsy_id"; SELECT setval('"rescue_file_tsy_id_seq"', 4, true); ALTER SEQUENCE "rescue_file_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "rescue_reg_sample_tsy_id_seq" +ALTER SEQUENCE "rescue_reg_sample_tsy_id_seq" OWNED BY "rescue_reg_sample"."tsy_id"; SELECT setval('"rescue_reg_sample_tsy_id_seq"', 9, true); ALTER SEQUENCE "rescue_reg_sample_tsy_id_seq" OWNER TO "postgres"; -ALTER SEQUENCE "rescue_reg_tsy_id_seq" +ALTER SEQUENCE "rescue_reg_tsy_id_seq" OWNED BY "rescue_reg"."tsy_id"; SELECT setval('"rescue_reg_tsy_id_seq"', 11, true); ALTER SEQUENCE "rescue_reg_tsy_id_seq" OWNER TO "postgres"; diff --git a/src/main/java/app.properties b/src/main/java/app.properties index 4e164a2..934fd6d 100644 --- a/src/main/java/app.properties +++ b/src/main/java/app.properties @@ -1,5 +1,5 @@ -AppDebug=true -AppTrace=true -AppParamHelper=cn.tsy.cas.idsse.rescue.helper.RescueParamHelper -AppListener=cn.tsy.cas.idsse.dsds.control.RescueInitializeListener +AppDebug=true +AppTrace=true +AppParamHelper=cn.tsy.cas.idsse.rescue.helper.RescueParamHelper +AppListener=cn.tsy.cas.idsse.dsds.control.RescueInitializeListener AppName=RescueServer \ No newline at end of file diff --git a/src/main/java/cn/tsy/cas/idsse/rescue/constant/RescueStatus.java b/src/main/java/cn/tsy/cas/idsse/rescue/constant/RescueStatus.java index d0b7cde..bb60945 100644 --- a/src/main/java/cn/tsy/cas/idsse/rescue/constant/RescueStatus.java +++ b/src/main/java/cn/tsy/cas/idsse/rescue/constant/RescueStatus.java @@ -1,27 +1,27 @@ -package cn.tsy.cas.idsse.rescue.constant; - -/*********************** - * 航次作业类型 - * @author TsySoft - * @create 2024-05-14 10:08:05 - * @version 1.0.0 - * @email revisit@126.com - * - */ -public class RescueStatus { - - /******************* - * 任务已创建 - */ - public static final String Created = "任务已创建"; - /******************* - * 任务进行中 - */ - public static final String Voyage = "任务进行中"; - /******************* - * 任务已完成 - */ - public static final String Complete = "任务已完成"; - - -} +package cn.tsy.cas.idsse.rescue.constant; + +/*********************** + * 航次作业类型 + * @author TsySoft + * @create 2024-05-14 10:08:05 + * @version 1.0.0 + * @email revisit@126.com + * + */ +public class RescueStatus { + + /******************* + * 任务已创建 + */ + public static final String Created = "任务已创建"; + /******************* + * 任务进行中 + */ + public static final String Voyage = "任务进行中"; + /******************* + * 任务已完成 + */ + public static final String Complete = "任务已完成"; + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueInitializeListener.java b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueInitializeListener.java index 0e26bdf..1b8f62b 100644 --- a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueInitializeListener.java +++ b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueInitializeListener.java @@ -1,19 +1,19 @@ -package cn.tsy.cas.idsse.rescue.control; - -import cn.hme.framework.core.HmeAppParamerter; -import jakarta.servlet.ServletContextEvent; -import jakarta.servlet.ServletContextListener; - -public class RescueInitializeListener implements ServletContextListener { - @Override - public void contextInitialized(ServletContextEvent sc) { - if (HmeAppParamerter.AppName.equals("RescueServer")) { - } - - - } - - @Override - public void contextDestroyed(ServletContextEvent sc) { - } -} +package cn.tsy.cas.idsse.rescue.control; + +import cn.hme.framework.core.HmeAppParamerter; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; + +public class RescueInitializeListener implements ServletContextListener { + @Override + public void contextInitialized(ServletContextEvent sc) { + if (HmeAppParamerter.AppName.equals("RescueServer")) { + } + + + } + + @Override + public void contextDestroyed(ServletContextEvent sc) { + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueParamControl.java b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueParamControl.java index 01b2263..8c3d0fd 100644 --- a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueParamControl.java +++ b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueParamControl.java @@ -1,22 +1,22 @@ -package cn.tsy.cas.idsse.rescue.control; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.data.frame.mapper.IHmeFrameParamMapper; -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; - - -@RestController -@RequestMapping("param") -public class RescueParamControl extends HmeAjaxControl{ - - @Autowired - private IHmeFrameParamMapper mParam; - @RequestMapping("list.htm") - public HmeAjax list() { - return new HmeAjax(this.mParam.all()); - } -} +package cn.tsy.cas.idsse.rescue.control; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.data.frame.mapper.IHmeFrameParamMapper; +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; + + +@RestController +@RequestMapping("param") +public class RescueParamControl extends HmeAjaxControl{ + + @Autowired + private IHmeFrameParamMapper mParam; + @RequestMapping("list.htm") + public HmeAjax list() { + return new HmeAjax(this.mParam.all()); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegControl.java b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegControl.java index eabd109..c366880 100644 --- a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegControl.java +++ b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegControl.java @@ -1,68 +1,68 @@ -package cn.tsy.cas.idsse.rescue.control; - -import java.time.LocalDateTime; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.tsy.cas.idsse.rescue.constant.RescueStatus; -import cn.tsy.cas.idsse.rescue.service.RescueRegService; -import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; -import cn.tsy.data.cas.idsse.rescue.model.RescueReg; - -@RestController -@RequestMapping("rescue/reg") -@CrossOrigin -public class RescueRegControl extends HmeAjaxControl { - - - @Autowired - private IRescueRegMapper iRescue; - - @Autowired - private RescueRegService sRescue; - - @RequestMapping("page.htm") - public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type, - RescueReg rescue) { - order = HmeStringHelper.hasValue(order) ? order : "tsy_id"; - type = HmeStringHelper.hasValue(type) ? type : "DESC"; - Pageable page = this.iRescue.rescueWithPage(group, start, limit, query, order, type, rescue); - return new HmeAjax(page); - } - - @RequestMapping("edit.htm") - public HmeAjax edit(RescueReg rescue) { - this.sRescue.editRescue(rescue); - return new HmeAjax(rescue); - } - - @RequestMapping("find.htm") - public HmeAjax find(int rescue_id) { - return new HmeAjax(this.iRescue.find(rescue_id)); - } - - @RequestMapping("delete.htm") - public HmeAjax delete(int rescue_id) { - this.sRescue.deleteRescue(rescue_id); - return new HmeAjax(); - } - - @RequestMapping("complete.htm") - public HmeAjax complete(int rescue_id) { - RescueReg reg = new RescueReg(); - reg.setTsy_id(rescue_id); - reg.setRescue_status(RescueStatus.Complete); - reg.setRescue_status_time(LocalDateTime.now()); - this.iRescue.update(reg); - return new HmeAjax(); - } - - -} +package cn.tsy.cas.idsse.rescue.control; + +import java.time.LocalDateTime; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.tsy.cas.idsse.rescue.constant.RescueStatus; +import cn.tsy.cas.idsse.rescue.service.RescueRegService; +import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; +import cn.tsy.data.cas.idsse.rescue.model.RescueReg; + +@RestController +@RequestMapping("rescue/reg") +@CrossOrigin +public class RescueRegControl extends HmeAjaxControl { + + + @Autowired + private IRescueRegMapper iRescue; + + @Autowired + private RescueRegService sRescue; + + @RequestMapping("page.htm") + public HmeAjax page(Integer group, Integer limit, Integer start, String query, String order, String type, + RescueReg rescue) { + order = HmeStringHelper.hasValue(order) ? order : "tsy_id"; + type = HmeStringHelper.hasValue(type) ? type : "DESC"; + Pageable page = this.iRescue.rescueWithPage(group, start, limit, query, order, type, rescue); + return new HmeAjax(page); + } + + @RequestMapping("edit.htm") + public HmeAjax edit(RescueReg rescue) { + this.sRescue.editRescue(rescue); + return new HmeAjax(rescue); + } + + @RequestMapping("find.htm") + public HmeAjax find(int rescue_id) { + return new HmeAjax(this.iRescue.find(rescue_id)); + } + + @RequestMapping("delete.htm") + public HmeAjax delete(int rescue_id) { + this.sRescue.deleteRescue(rescue_id); + return new HmeAjax(); + } + + @RequestMapping("complete.htm") + public HmeAjax complete(int rescue_id) { + RescueReg reg = new RescueReg(); + reg.setTsy_id(rescue_id); + reg.setRescue_status(RescueStatus.Complete); + reg.setRescue_status_time(LocalDateTime.now()); + this.iRescue.update(reg); + return new HmeAjax(); + } + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegFileControl.java b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegFileControl.java index 3af0bc8..b50bef4 100644 --- a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegFileControl.java +++ b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegFileControl.java @@ -1,91 +1,91 @@ -package cn.tsy.cas.idsse.rescue.control; - -import java.io.File; -import java.time.LocalDateTime; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.hme.framework.frame.helper.HmeWebHelper; -import cn.hme.framework.helper.io.HmeMultipartFileHelper; -import cn.hme.framework.helper.time.HmeLocalDateHelper; -import cn.tsy.cas.idsse.rescue.helper.RescueParamHelper; -import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegFileMapper; -import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; -import cn.tsy.data.cas.idsse.rescue.model.RescueReg; -import cn.tsy.data.cas.idsse.rescue.model.RescueRegFile; - -@RestController -@RequestMapping("rescue/reg/file") -@CrossOrigin -public class RescueRegFileControl extends HmeAjaxControl { - - @Autowired - private IRescueRegMapper iRescue; - @Autowired - private IRescueRegFileMapper iRescueFile; - - @RequestMapping("upload.htm") - public HmeAjax upload(int rescue_id, MultipartFile file) { - new File(RescueParamHelper.RescueFileRoot).mkdirs(); - RescueReg reg = this.iRescue.find(rescue_id); - String file_name = reg.getRescue_code() + HmeLocalDateHelper.formatNoSplit(LocalDateTime.now()) + "." - + HmeMultipartFileHelper.getFileSuffix(file); - File f = new File(RescueParamHelper.RescueFileRoot - + (RescueParamHelper.RescueFileRoot.endsWith(File.separator) ? "" : File.separator) + file_name); - HmeMultipartFileHelper.fromUpload(file, f); - RescueRegFile rFile = new RescueRegFile(); - rFile.setRescue_id(rescue_id); - rFile.setFile_length(f.length() + ""); - rFile.setFile_org_name(file.getOriginalFilename()); - rFile.setFile_path(f.getPath()); - rFile.setFile_real_name(f.getName()); - this.iRescueFile.insert(rFile); - return new HmeAjax(rFile); - } - - @RequestMapping("view.htm") - public void view(int file_id) { - RescueRegFile f = this.iRescueFile.find(file_id); - File file = new File(RescueParamHelper.RescueFileRoot - + (RescueParamHelper.RescueFileRoot.endsWith(File.separator) ? "" : File.separator) - + f.getFile_real_name()); - if (file.exists()) - HmeWebHelper.viewImage(file, file.getName(), false); - } - - @RequestMapping("delete.htm") - public HmeAjax deleteFile(int file_id) { - RescueRegFile f = this.iRescueFile.find(file_id); - File file = new File(RescueParamHelper.RescueFileRoot - + (RescueParamHelper.RescueFileRoot.endsWith(File.separator) ? "" : File.separator) - + f.getFile_real_name()); - if (file.exists()) { - file.delete(); - } - this.iRescueFile.delete(file_id); - return new HmeAjax(); - } - - @RequestMapping("list.htm") - public HmeAjax list(int rescue_id) { - return new HmeAjax(this.iRescueFile.listByColumn("rescue_id", rescue_id,"tsy_id")); - } - - @RequestMapping("download.htm") - public void download(int file_id) { - RescueRegFile f = this.iRescueFile.find(file_id); - File file = new File(RescueParamHelper.RescueFileRoot - + (RescueParamHelper.RescueFileRoot.endsWith(File.separator) ? "" : File.separator) - + f.getFile_real_name()); - if (file.exists()) - HmeWebHelper.downloadFile(file, file.getName()); - } - - -} +package cn.tsy.cas.idsse.rescue.control; + +import java.io.File; +import java.time.LocalDateTime; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.hme.framework.frame.helper.HmeWebHelper; +import cn.hme.framework.helper.io.HmeMultipartFileHelper; +import cn.hme.framework.helper.time.HmeLocalDateHelper; +import cn.tsy.cas.idsse.rescue.helper.RescueParamHelper; +import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegFileMapper; +import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; +import cn.tsy.data.cas.idsse.rescue.model.RescueReg; +import cn.tsy.data.cas.idsse.rescue.model.RescueRegFile; + +@RestController +@RequestMapping("rescue/reg/file") +@CrossOrigin +public class RescueRegFileControl extends HmeAjaxControl { + + @Autowired + private IRescueRegMapper iRescue; + @Autowired + private IRescueRegFileMapper iRescueFile; + + @RequestMapping("upload.htm") + public HmeAjax upload(int rescue_id, MultipartFile file) { + new File(RescueParamHelper.RescueFileRoot).mkdirs(); + RescueReg reg = this.iRescue.find(rescue_id); + String file_name = reg.getRescue_code() + HmeLocalDateHelper.formatNoSplit(LocalDateTime.now()) + "." + + HmeMultipartFileHelper.getFileSuffix(file); + File f = new File(RescueParamHelper.RescueFileRoot + + (RescueParamHelper.RescueFileRoot.endsWith(File.separator) ? "" : File.separator) + file_name); + HmeMultipartFileHelper.fromUpload(file, f); + RescueRegFile rFile = new RescueRegFile(); + rFile.setRescue_id(rescue_id); + rFile.setFile_length(f.length() + ""); + rFile.setFile_org_name(file.getOriginalFilename()); + rFile.setFile_path(f.getPath()); + rFile.setFile_real_name(f.getName()); + this.iRescueFile.insert(rFile); + return new HmeAjax(rFile); + } + + @RequestMapping("view.htm") + public void view(int file_id) { + RescueRegFile f = this.iRescueFile.find(file_id); + File file = new File(RescueParamHelper.RescueFileRoot + + (RescueParamHelper.RescueFileRoot.endsWith(File.separator) ? "" : File.separator) + + f.getFile_real_name()); + if (file.exists()) + HmeWebHelper.viewImage(file, file.getName(), false); + } + + @RequestMapping("delete.htm") + public HmeAjax deleteFile(int file_id) { + RescueRegFile f = this.iRescueFile.find(file_id); + File file = new File(RescueParamHelper.RescueFileRoot + + (RescueParamHelper.RescueFileRoot.endsWith(File.separator) ? "" : File.separator) + + f.getFile_real_name()); + if (file.exists()) { + file.delete(); + } + this.iRescueFile.delete(file_id); + return new HmeAjax(); + } + + @RequestMapping("list.htm") + public HmeAjax list(int rescue_id) { + return new HmeAjax(this.iRescueFile.listByColumn("rescue_id", rescue_id,"tsy_id")); + } + + @RequestMapping("download.htm") + public void download(int file_id) { + RescueRegFile f = this.iRescueFile.find(file_id); + File file = new File(RescueParamHelper.RescueFileRoot + + (RescueParamHelper.RescueFileRoot.endsWith(File.separator) ? "" : File.separator) + + f.getFile_real_name()); + if (file.exists()) + HmeWebHelper.downloadFile(file, file.getName()); + } + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegSampleControl.java b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegSampleControl.java index 93e3fbe..62daf98 100644 --- a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegSampleControl.java +++ b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueRegSampleControl.java @@ -1,47 +1,44 @@ -package cn.tsy.cas.idsse.rescue.control; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.tsy.cas.idsse.rescue.service.RescueRegSampleService; -import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; -import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegSampleMapper; -import cn.tsy.data.cas.idsse.rescue.model.RescueRegSample; - -@RestController -@RequestMapping("rescue/reg/sample") -@CrossOrigin -public class RescueRegSampleControl extends HmeAjaxControl { - - @Autowired - private IRescueRegMapper iRescue; - @Autowired - private IRescueRegSampleMapper iRescueSample; - @Autowired - private RescueRegSampleService sSample; - - @RequestMapping("add.htm") - public HmeAjax add(RescueRegSample sa) { - this.sSample.addSample(sa); - return new HmeAjax(); - } - - @RequestMapping("list.htm") - public HmeAjax list(int rescue_id) { - return new HmeAjax(this.iRescueSample.listByColumn("rescue_id", rescue_id, "sample_name")); - } - - - @RequestMapping("delete.htm") - public HmeAjax delete(int tsy_id) { - this.iRescueSample.delete(tsy_id); - return new HmeAjax(); - } - - - -} +package cn.tsy.cas.idsse.rescue.control; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.tsy.cas.idsse.rescue.service.RescueRegSampleService; +import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegSampleMapper; +import cn.tsy.data.cas.idsse.rescue.model.RescueRegSample; + +@RestController +@RequestMapping("rescue/reg/sample") +@CrossOrigin +public class RescueRegSampleControl extends HmeAjaxControl { + + @Autowired + private IRescueRegSampleMapper iRescueSample; + @Autowired + private RescueRegSampleService sSample; + + @RequestMapping("add.htm") + public HmeAjax add(RescueRegSample sa) { + this.sSample.addSample(sa); + return new HmeAjax(); + } + + @RequestMapping("list.htm") + public HmeAjax list(int rescue_id) { + return new HmeAjax(this.iRescueSample.listByColumn("rescue_id", rescue_id, "sample_name")); + } + + + @RequestMapping("delete.htm") + public HmeAjax delete(int tsy_id) { + this.iRescueSample.delete(tsy_id); + return new HmeAjax(); + } + + + +} diff --git a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueReportControl.java b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueReportControl.java index da1aada..541f65f 100644 --- a/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueReportControl.java +++ b/src/main/java/cn/tsy/cas/idsse/rescue/control/RescueReportControl.java @@ -1,23 +1,23 @@ -package cn.tsy.cas.idsse.rescue.control; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import cn.hme.framework.frame.control.HmeAjax; -import cn.hme.framework.frame.control.HmeAjaxControl; -import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; - - -@RestController -@RequestMapping("report") -public class RescueReportControl extends HmeAjaxControl{ - - @Autowired - private IRescueRegMapper iRescue; - - @RequestMapping("main.htm") - public HmeAjax list() { - return new HmeAjax(iRescue.reportRescue()); - } -} +package cn.tsy.cas.idsse.rescue.control; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.hme.framework.frame.control.HmeAjaxControl; +import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; + + +@RestController +@RequestMapping("report") +public class RescueReportControl extends HmeAjaxControl{ + + @Autowired + private IRescueRegMapper iRescue; + + @RequestMapping("main.htm") + public HmeAjax list() { + return new HmeAjax(iRescue.reportRescue()); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/rescue/helper/RescueParamHelper.java b/src/main/java/cn/tsy/cas/idsse/rescue/helper/RescueParamHelper.java index 0018884..f96ca38 100644 --- a/src/main/java/cn/tsy/cas/idsse/rescue/helper/RescueParamHelper.java +++ b/src/main/java/cn/tsy/cas/idsse/rescue/helper/RescueParamHelper.java @@ -1,9 +1,9 @@ -package cn.tsy.cas.idsse.rescue.helper; - -public class RescueParamHelper { - - /*********************** - * 根目录 - */ - public static String RescueFileRoot = "/opt/rescue"; -} +package cn.tsy.cas.idsse.rescue.helper; + +public class RescueParamHelper { + + /*********************** + * 根目录 + */ + public static String RescueFileRoot = "/opt/rescue"; +} diff --git a/src/main/java/cn/tsy/cas/idsse/rescue/service/RescueRegSampleService.java b/src/main/java/cn/tsy/cas/idsse/rescue/service/RescueRegSampleService.java index 2d77c78..d603b40 100644 --- a/src/main/java/cn/tsy/cas/idsse/rescue/service/RescueRegSampleService.java +++ b/src/main/java/cn/tsy/cas/idsse/rescue/service/RescueRegSampleService.java @@ -1,39 +1,39 @@ -package cn.tsy.cas.idsse.rescue.service; - -import java.time.LocalDateTime; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.hme.framework.jdbc.entity.SqlCondition; -import cn.tsy.cas.idsse.rescue.constant.RescueStatus; -import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; -import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegSampleMapper; -import cn.tsy.data.cas.idsse.rescue.model.RescueReg; -import cn.tsy.data.cas.idsse.rescue.model.RescueRegSample; - -@Service -public class RescueRegSampleService { - - @Autowired - private IRescueRegSampleMapper iRegSample; - @Autowired - private IRescueRegMapper iRescue; - - public void addSample(RescueRegSample sa) { - HmeFrameAssertHelper.isNotNull(sa.getRescue_id()); - HmeFrameAssertHelper.isNotEmpty(sa.getDataset_name(),"样品集名称不能为空"); - HmeFrameAssertHelper.isNotEmpty(sa.getSample_name(),"样品名称不能为空"); - HmeFrameAssertHelper.isNotEmpty(sa.getVoyage_name(),"航次名称不能为空"); - this.iRegSample.deleteByCondition(SqlCondition.of("rescue_id", sa.getRescue_id()),SqlCondition.of("sample_name", sa.getSample_name())); - sa.setCreate_time(LocalDateTime.now()); - this.iRegSample.insert(sa); - RescueReg reg =new RescueReg(); - reg.setTsy_id(sa.getRescue_id()); - reg.setRescue_status(RescueStatus.Voyage); - reg.setRescue_status_time(LocalDateTime.now()); - this.iRescue.update(reg); - } - -} +package cn.tsy.cas.idsse.rescue.service; + +import java.time.LocalDateTime; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.hme.framework.jdbc.entity.SqlCondition; +import cn.tsy.cas.idsse.rescue.constant.RescueStatus; +import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; +import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegSampleMapper; +import cn.tsy.data.cas.idsse.rescue.model.RescueReg; +import cn.tsy.data.cas.idsse.rescue.model.RescueRegSample; + +@Service +public class RescueRegSampleService { + + @Autowired + private IRescueRegSampleMapper iRegSample; + @Autowired + private IRescueRegMapper iRescue; + + public void addSample(RescueRegSample sa) { + HmeFrameAssertHelper.isNotNull(sa.getRescue_id()); + HmeFrameAssertHelper.isNotEmpty(sa.getDataset_name(),"样品集名称不能为空"); + HmeFrameAssertHelper.isNotEmpty(sa.getSample_name(),"样品名称不能为空"); + HmeFrameAssertHelper.isNotEmpty(sa.getVoyage_name(),"航次名称不能为空"); + this.iRegSample.deleteByCondition(SqlCondition.of("rescue_id", sa.getRescue_id()),SqlCondition.of("sample_name", sa.getSample_name())); + sa.setCreate_time(LocalDateTime.now()); + this.iRegSample.insert(sa); + RescueReg reg =new RescueReg(); + reg.setTsy_id(sa.getRescue_id()); + reg.setRescue_status(RescueStatus.Voyage); + reg.setRescue_status_time(LocalDateTime.now()); + this.iRescue.update(reg); + } + +} diff --git a/src/main/java/cn/tsy/cas/idsse/rescue/service/RescueRegService.java b/src/main/java/cn/tsy/cas/idsse/rescue/service/RescueRegService.java index 1b22f06..7765e8b 100644 --- a/src/main/java/cn/tsy/cas/idsse/rescue/service/RescueRegService.java +++ b/src/main/java/cn/tsy/cas/idsse/rescue/service/RescueRegService.java @@ -1,57 +1,57 @@ -package cn.tsy.cas.idsse.rescue.service; - -import java.time.LocalDateTime; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import cn.hme.framework.frame.helper.HmeFrameAssertHelper; -import cn.hme.framework.helper.lang.HmeStringHelper; -import cn.tsy.cas.idsse.rescue.constant.RescueStatus; -import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegFileMapper; -import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; -import cn.tsy.data.cas.idsse.rescue.model.RescueReg; - -@Service -public class RescueRegService { - - @Autowired - private IRescueRegMapper iReg; - - @Autowired - private IRescueRegFileMapper iFile; - - public void editRescue(RescueReg rescue) { - - // rescue_type - HmeFrameAssertHelper.isNotEmpty(rescue.getRescue_type(), "应急搜捞类型不能为空！"); - HmeFrameAssertHelper.isNotEmpty(rescue.getRescue_target_type(), "目标类型不能为空！"); - if (rescue.getTsy_id() == null) { - // 新增，自动生成rescue_code - // 获取上一个序号 - String sql = "select * from rescue_reg order by tsy_id desc limit 1"; - List regArray = this.iReg.listBySql(sql); - String rescue_code = rescue.getRescue_type() + "_" + rescue.getRescue_target_type() + "_"; - if (regArray.size() == 0) { - rescue_code = rescue_code + "0001"; - } else { - int seq = Integer.parseInt(regArray.get(0).getRescue_code().split("_")[2])+1; - rescue_code = rescue_code + HmeStringHelper.leftPad(seq + "", 4, '0'); - } - rescue.setRescue_status(RescueStatus.Created); - rescue.setRescue_code(rescue_code); - rescue.setFill_time(LocalDateTime.now()); - rescue.setRescue_status_time(LocalDateTime.now()); - this.iReg.insert(rescue); - } else { - this.iReg.update(rescue); - } - } - - public void deleteRescue(int rescue_id) { - this.iFile.deleteByColumn("rescue_id", rescue_id); - this.iReg.delete(rescue_id); - } - -} +package cn.tsy.cas.idsse.rescue.service; + +import java.time.LocalDateTime; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import cn.hme.framework.frame.helper.HmeFrameAssertHelper; +import cn.hme.framework.helper.lang.HmeStringHelper; +import cn.tsy.cas.idsse.rescue.constant.RescueStatus; +import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegFileMapper; +import cn.tsy.data.cas.idsse.rescue.mapper.IRescueRegMapper; +import cn.tsy.data.cas.idsse.rescue.model.RescueReg; + +@Service +public class RescueRegService { + + @Autowired + private IRescueRegMapper iReg; + + @Autowired + private IRescueRegFileMapper iFile; + + public void editRescue(RescueReg rescue) { + + // rescue_type + HmeFrameAssertHelper.isNotEmpty(rescue.getRescue_type(), "应急搜捞类型不能为空！"); + HmeFrameAssertHelper.isNotEmpty(rescue.getRescue_target_type(), "目标类型不能为空！"); + if (rescue.getTsy_id() == null) { + // 新增，自动生成rescue_code + // 获取上一个序号 + String sql = "select * from rescue_reg order by tsy_id desc limit 1"; + List regArray = this.iReg.listBySql(sql); + String rescue_code = rescue.getRescue_type() + "_" + rescue.getRescue_target_type() + "_"; + if (regArray.size() == 0) { + rescue_code = rescue_code + "0001"; + } else { + int seq = Integer.parseInt(regArray.get(0).getRescue_code().split("_")[2])+1; + rescue_code = rescue_code + HmeStringHelper.leftPad(seq + "", 4, '0'); + } + rescue.setRescue_status(RescueStatus.Created); + rescue.setRescue_code(rescue_code); + rescue.setFill_time(LocalDateTime.now()); + rescue.setRescue_status_time(LocalDateTime.now()); + this.iReg.insert(rescue); + } else { + this.iReg.update(rescue); + } + } + + public void deleteRescue(int rescue_id) { + this.iFile.deleteByColumn("rescue_id", rescue_id); + this.iReg.delete(rescue_id); + } + +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegFileMapper.java b/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegFileMapper.java index a4d1583..8da4225 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegFileMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegFileMapper.java @@ -1,10 +1,10 @@ -package cn.tsy.data.cas.idsse.rescue.mapper; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.rescue.model.RescueRegFile; - -@HmeMapper -public interface IRescueRegFileMapper extends IHmeMapper{ - -} +package cn.tsy.data.cas.idsse.rescue.mapper; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.rescue.model.RescueRegFile; + +@HmeMapper +public interface IRescueRegFileMapper extends IHmeMapper{ + +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.java b/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.java index c6583b5..0c32b8c 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.java @@ -1,27 +1,27 @@ -package cn.tsy.data.cas.idsse.rescue.mapper; - -import java.util.List; -import java.util.Map; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.entity.Pageable; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.rescue.model.RescueReg; - -@HmeMapper -public interface IRescueRegMapper extends IHmeMapper{ - public Pageable rescueWithPage( - @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, - @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, - @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, - @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, - @Param("rescue") RescueReg rescue - ); - - public List> reportRescue(); -} +package cn.tsy.data.cas.idsse.rescue.mapper; + +import java.util.List; +import java.util.Map; + +import org.apache.ibatis.annotations.Param; + +import cn.hme.framework.jdbc.constant.SqlProviderConstant; +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.entity.Pageable; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.rescue.model.RescueReg; + +@HmeMapper +public interface IRescueRegMapper extends IHmeMapper{ + public Pageable rescueWithPage( + @Param(SqlProviderConstant.PARAM_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.PARAM_PAGE_START) Integer start, + @Param(SqlProviderConstant.PARAM_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.PARAM_PAGE_QUERY) String query, + @Param(SqlProviderConstant.PARAM_PAGE_ORDER) String order, + @Param(SqlProviderConstant.PARAM_PAGE_TYPE) String type, + @Param("rescue") RescueReg rescue + ); + + public List> reportRescue(); +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.xml index 3a347bf..8501c21 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegMapper.xml @@ -1,68 +1,68 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegSampleMapper.java b/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegSampleMapper.java index 451e79c..7f21197 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegSampleMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/rescue/mapper/IRescueRegSampleMapper.java @@ -1,10 +1,10 @@ -package cn.tsy.data.cas.idsse.rescue.mapper; - -import cn.hme.framework.jdbc.core.HmeMapper; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.tsy.data.cas.idsse.rescue.model.RescueRegSample; - -@HmeMapper -public interface IRescueRegSampleMapper extends IHmeMapper{ - -} +package cn.tsy.data.cas.idsse.rescue.mapper; + +import cn.hme.framework.jdbc.core.HmeMapper; +import cn.hme.framework.jdbc.mapper.IHmeMapper; +import cn.tsy.data.cas.idsse.rescue.model.RescueRegSample; + +@HmeMapper +public interface IRescueRegSampleMapper extends IHmeMapper{ + +} diff --git a/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueReg.java b/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueReg.java index 5253223..1fe158a 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueReg.java +++ b/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueReg.java @@ -1,471 +1,471 @@ -package cn.tsy.data.cas.idsse.rescue.model; - -import cn.hme.framework.jdbc.core.HmeTable; -import java.time.LocalDateTime; - -/********************************************** - * 应急搜救任务 - * - * @author: ZhangXiaoQing - * @date: 2025-10-28 23:41:00 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "RESCUE_REG", key = { "TSY_ID" }) -public class RescueReg { - // rescue - private Integer tsy_id; - // 状态信息 - private String rescue_status; - // 状态变更时间 - private LocalDateTime rescue_status_time; - // 状态变更说明 - private String rescue_status_note; - // 应急搜捞：SAR 专项调查：SI - private String rescue_type; - // 任务类型_目标类别_总序列号:SAR_Wreck_075 - private String rescue_code; - // 如果未知，可填写未知大型沉物：Wreck、锚系类目标Mooring、非合作方目标NCT、其他Other - private String rescue_target_type; - // 目标类别按字典管理，分成四大类：大型沉物、锚系类目标、非合作方目标、其他，具体目标名称手动录入 - - private String rescue_target_name; - // 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（经度） - private String rescue_target_lon; - // 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（纬度） - private String rescue_target_lat; - // 给定搜寻范围半径 - private String rescue_target_radius; - // 宽度（单位米） - private String rescue_target_width; - // 长度（单位米） - private String rescue_target_length; - // 高度（单位米） - private String rescue_target_height; - // 搜寻处置目标重量（空气中）kg/吨 - private String rescue_air_weight; - // 搜寻处置目标重量（水中）kg/吨 - private String rescue_water_weight; - // 搜寻处置目标水深（米） - private String rescue_water_depth; - // 搜寻处置目标预估价值 - - private String rescue_target_price; - // 快速响应等级 - - private String rescue_response_level; - // 是否涉密 - - private String rescue_secrecy; - // 搜捞目标的所属单位，手动录入 - - private String rescue_unit; - // 快速响应时间要求,比如说最晚10天就要捞上来，手动录入天数 - private String rescue_response_day; - // 填报时间 - - private LocalDateTime fill_time; - // 联系人信息 - - private String fill_person; - // 填报电话 - private String fill_tel; - // 备注 - private String rescue_note; - // 填报说明 - private String fill_note; - - /**** - * rescue - */ - public Integer getTsy_id() { - return this.tsy_id; - } - - /**** - * rescue - */ - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 状态信息 - */ - public String getRescue_status() { - return this.rescue_status; - } - - /**** - * 状态信息 - */ - public void setRescue_status(String rescue_status) { - this.rescue_status = rescue_status; - } - - /**** - * 状态变更时间 - */ - public LocalDateTime getRescue_status_time() { - return this.rescue_status_time; - } - - /**** - * 状态变更时间 - */ - public void setRescue_status_time(LocalDateTime rescue_status_time) { - this.rescue_status_time = rescue_status_time; - } - - /**** - * 状态变更说明 - */ - public String getRescue_status_note() { - return this.rescue_status_note; - } - - /**** - * 状态变更说明 - */ - public void setRescue_status_note(String rescue_status_note) { - this.rescue_status_note = rescue_status_note; - } - - /**** - * 应急搜捞：SAR 专项调查：SI - */ - public String getRescue_type() { - return this.rescue_type; - } - - /**** - * 应急搜捞：SAR 专项调查：SI - */ - public void setRescue_type(String rescue_type) { - this.rescue_type = rescue_type; - } - - /**** - * 任务类型_目标类别_总序列号:SAR_Wreck_075 - */ - public String getRescue_code() { - return this.rescue_code; - } - - /**** - * 任务类型_目标类别_总序列号:SAR_Wreck_075 - */ - public void setRescue_code(String rescue_code) { - this.rescue_code = rescue_code; - } - - /**** - * 如果未知，可填写未知大型沉物：Wreck、锚系类目标Mooring、非合作方目标NCT、其他Other - */ - public String getRescue_target_type() { - return this.rescue_target_type; - } - - /**** - * 如果未知，可填写未知大型沉物：Wreck、锚系类目标Mooring、非合作方目标NCT、其他Other - */ - public void setRescue_target_type(String rescue_target_type) { - this.rescue_target_type = rescue_target_type; - } - - /**** - * 目标类别按字典管理，分成四大类：大型沉物、锚系类目标、非合作方目标、其他，具体目标名称手动录入 - * - */ - public String getRescue_target_name() { - return this.rescue_target_name; - } - - /**** - * 目标类别按字典管理，分成四大类：大型沉物、锚系类目标、非合作方目标、其他，具体目标名称手动录入 - * - */ - public void setRescue_target_name(String rescue_target_name) { - this.rescue_target_name = rescue_target_name; - } - - /**** - * 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（经度） - */ - public String getRescue_target_lon() { - return this.rescue_target_lon; - } - - /**** - * 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（经度） - */ - public void setRescue_target_lon(String rescue_target_lon) { - this.rescue_target_lon = rescue_target_lon; - } - - /**** - * 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（纬度） - */ - public String getRescue_target_lat() { - return this.rescue_target_lat; - } - - /**** - * 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（纬度） - */ - public void setRescue_target_lat(String rescue_target_lat) { - this.rescue_target_lat = rescue_target_lat; - } - - /**** - * 给定搜寻范围半径 - */ - public String getRescue_target_radius() { - return this.rescue_target_radius; - } - - /**** - * 给定搜寻范围半径 - */ - public void setRescue_target_radius(String rescue_target_radius) { - this.rescue_target_radius = rescue_target_radius; - } - - /**** - * 宽度（单位米） - */ - public String getRescue_target_width() { - return this.rescue_target_width; - } - - /**** - * 宽度（单位米） - */ - public void setRescue_target_width(String rescue_target_width) { - this.rescue_target_width = rescue_target_width; - } - - /**** - * 长度（单位米） - */ - public String getRescue_target_length() { - return this.rescue_target_length; - } - - /**** - * 长度（单位米） - */ - public void setRescue_target_length(String rescue_target_length) { - this.rescue_target_length = rescue_target_length; - } - - /**** - * 高度（单位米） - */ - public String getRescue_target_height() { - return this.rescue_target_height; - } - - /**** - * 高度（单位米） - */ - public void setRescue_target_height(String rescue_target_height) { - this.rescue_target_height = rescue_target_height; - } - - /**** - * 搜寻处置目标重量（空气中）kg/吨 - */ - public String getRescue_air_weight() { - return this.rescue_air_weight; - } - - /**** - * 搜寻处置目标重量（空气中）kg/吨 - */ - public void setRescue_air_weight(String rescue_air_weight) { - this.rescue_air_weight = rescue_air_weight; - } - - /**** - * 搜寻处置目标重量（水中）kg/吨 - */ - public String getRescue_water_weight() { - return this.rescue_water_weight; - } - - /**** - * 搜寻处置目标重量（水中）kg/吨 - */ - public void setRescue_water_weight(String rescue_water_weight) { - this.rescue_water_weight = rescue_water_weight; - } - - /**** - * 搜寻处置目标水深（米） - */ - public String getRescue_water_depth() { - return this.rescue_water_depth; - } - - /**** - * 搜寻处置目标水深（米） - */ - public void setRescue_water_depth(String rescue_water_depth) { - this.rescue_water_depth = rescue_water_depth; - } - - /**** - * 搜寻处置目标预估价值 - * - */ - public String getRescue_target_price() { - return this.rescue_target_price; - } - - /**** - * 搜寻处置目标预估价值 - * - */ - public void setRescue_target_price(String rescue_target_price) { - this.rescue_target_price = rescue_target_price; - } - - /**** - * 快速响应等级 - * - */ - public String getRescue_response_level() { - return this.rescue_response_level; - } - - /**** - * 快速响应等级 - * - */ - public void setRescue_response_level(String rescue_response_level) { - this.rescue_response_level = rescue_response_level; - } - - /**** - * 是否涉密 - * - */ - public String getRescue_secrecy() { - return this.rescue_secrecy; - } - - /**** - * 是否涉密 - * - */ - public void setRescue_secrecy(String rescue_secrecy) { - this.rescue_secrecy = rescue_secrecy; - } - - /**** - * 搜捞目标的所属单位，手动录入 - * - */ - public String getRescue_unit() { - return this.rescue_unit; - } - - /**** - * 搜捞目标的所属单位，手动录入 - * - */ - public void setRescue_unit(String rescue_unit) { - this.rescue_unit = rescue_unit; - } - - /**** - * 快速响应时间要求,比如说最晚10天就要捞上来，手动录入天数 - */ - public String getRescue_response_day() { - return this.rescue_response_day; - } - - /**** - * 快速响应时间要求,比如说最晚10天就要捞上来，手动录入天数 - */ - public void setRescue_response_day(String rescue_response_day) { - this.rescue_response_day = rescue_response_day; - } - - /**** - * 填报时间 - * - */ - public LocalDateTime getFill_time() { - return this.fill_time; - } - - /**** - * 填报时间 - * - */ - public void setFill_time(LocalDateTime fill_time) { - this.fill_time = fill_time; - } - - /**** - * 联系人信息 - * - */ - public String getFill_person() { - return this.fill_person; - } - - /**** - * 联系人信息 - * - */ - public void setFill_person(String fill_person) { - this.fill_person = fill_person; - } - - /**** - * 填报电话 - */ - public String getFill_tel() { - return this.fill_tel; - } - - /**** - * 填报电话 - */ - public void setFill_tel(String fill_tel) { - this.fill_tel = fill_tel; - } - - /**** - * 备注 - */ - public String getRescue_note() { - return this.rescue_note; - } - - /**** - * 备注 - */ - public void setRescue_note(String rescue_note) { - this.rescue_note = rescue_note; - } - - /**** - * 填报说明 - */ - public String getFill_note() { - return this.fill_note; - } - - /**** - * 填报说明 - */ - public void setFill_note(String fill_note) { - this.fill_note = fill_note; - } - +package cn.tsy.data.cas.idsse.rescue.model; + +import cn.hme.framework.jdbc.core.HmeTable; +import java.time.LocalDateTime; + +/********************************************** + * 应急搜救任务 + * + * @author: ZhangXiaoQing + * @date: 2025-10-28 23:41:00 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "RESCUE_REG", key = { "TSY_ID" }) +public class RescueReg { + // rescue + private Integer tsy_id; + // 状态信息 + private String rescue_status; + // 状态变更时间 + private LocalDateTime rescue_status_time; + // 状态变更说明 + private String rescue_status_note; + // 应急搜捞：SAR 专项调查：SI + private String rescue_type; + // 任务类型_目标类别_总序列号:SAR_Wreck_075 + private String rescue_code; + // 如果未知，可填写未知大型沉物：Wreck、锚系类目标Mooring、非合作方目标NCT、其他Other + private String rescue_target_type; + // 目标类别按字典管理，分成四大类：大型沉物、锚系类目标、非合作方目标、其他，具体目标名称手动录入 + + private String rescue_target_name; + // 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（经度） + private String rescue_target_lon; + // 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（纬度） + private String rescue_target_lat; + // 给定搜寻范围半径 + private String rescue_target_radius; + // 宽度（单位米） + private String rescue_target_width; + // 长度（单位米） + private String rescue_target_length; + // 高度（单位米） + private String rescue_target_height; + // 搜寻处置目标重量（空气中）kg/吨 + private String rescue_air_weight; + // 搜寻处置目标重量（水中）kg/吨 + private String rescue_water_weight; + // 搜寻处置目标水深（米） + private String rescue_water_depth; + // 搜寻处置目标预估价值 + + private String rescue_target_price; + // 快速响应等级 + + private String rescue_response_level; + // 是否涉密 + + private String rescue_secrecy; + // 搜捞目标的所属单位，手动录入 + + private String rescue_unit; + // 快速响应时间要求,比如说最晚10天就要捞上来，手动录入天数 + private String rescue_response_day; + // 填报时间 + + private LocalDateTime fill_time; + // 联系人信息 + + private String fill_person; + // 填报电话 + private String fill_tel; + // 备注 + private String rescue_note; + // 填报说明 + private String fill_note; + + /**** + * rescue + */ + public Integer getTsy_id() { + return this.tsy_id; + } + + /**** + * rescue + */ + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 状态信息 + */ + public String getRescue_status() { + return this.rescue_status; + } + + /**** + * 状态信息 + */ + public void setRescue_status(String rescue_status) { + this.rescue_status = rescue_status; + } + + /**** + * 状态变更时间 + */ + public LocalDateTime getRescue_status_time() { + return this.rescue_status_time; + } + + /**** + * 状态变更时间 + */ + public void setRescue_status_time(LocalDateTime rescue_status_time) { + this.rescue_status_time = rescue_status_time; + } + + /**** + * 状态变更说明 + */ + public String getRescue_status_note() { + return this.rescue_status_note; + } + + /**** + * 状态变更说明 + */ + public void setRescue_status_note(String rescue_status_note) { + this.rescue_status_note = rescue_status_note; + } + + /**** + * 应急搜捞：SAR 专项调查：SI + */ + public String getRescue_type() { + return this.rescue_type; + } + + /**** + * 应急搜捞：SAR 专项调查：SI + */ + public void setRescue_type(String rescue_type) { + this.rescue_type = rescue_type; + } + + /**** + * 任务类型_目标类别_总序列号:SAR_Wreck_075 + */ + public String getRescue_code() { + return this.rescue_code; + } + + /**** + * 任务类型_目标类别_总序列号:SAR_Wreck_075 + */ + public void setRescue_code(String rescue_code) { + this.rescue_code = rescue_code; + } + + /**** + * 如果未知，可填写未知大型沉物：Wreck、锚系类目标Mooring、非合作方目标NCT、其他Other + */ + public String getRescue_target_type() { + return this.rescue_target_type; + } + + /**** + * 如果未知，可填写未知大型沉物：Wreck、锚系类目标Mooring、非合作方目标NCT、其他Other + */ + public void setRescue_target_type(String rescue_target_type) { + this.rescue_target_type = rescue_target_type; + } + + /**** + * 目标类别按字典管理，分成四大类：大型沉物、锚系类目标、非合作方目标、其他，具体目标名称手动录入 + * + */ + public String getRescue_target_name() { + return this.rescue_target_name; + } + + /**** + * 目标类别按字典管理，分成四大类：大型沉物、锚系类目标、非合作方目标、其他，具体目标名称手动录入 + * + */ + public void setRescue_target_name(String rescue_target_name) { + this.rescue_target_name = rescue_target_name; + } + + /**** + * 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（经度） + */ + public String getRescue_target_lon() { + return this.rescue_target_lon; + } + + /**** + * 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（经度） + */ + public void setRescue_target_lon(String rescue_target_lon) { + this.rescue_target_lon = rescue_target_lon; + } + + /**** + * 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（纬度） + */ + public String getRescue_target_lat() { + return this.rescue_target_lat; + } + + /**** + * 给定点的经纬度位置，若给定的是搜寻区域，此处为中心点坐标（纬度） + */ + public void setRescue_target_lat(String rescue_target_lat) { + this.rescue_target_lat = rescue_target_lat; + } + + /**** + * 给定搜寻范围半径 + */ + public String getRescue_target_radius() { + return this.rescue_target_radius; + } + + /**** + * 给定搜寻范围半径 + */ + public void setRescue_target_radius(String rescue_target_radius) { + this.rescue_target_radius = rescue_target_radius; + } + + /**** + * 宽度（单位米） + */ + public String getRescue_target_width() { + return this.rescue_target_width; + } + + /**** + * 宽度（单位米） + */ + public void setRescue_target_width(String rescue_target_width) { + this.rescue_target_width = rescue_target_width; + } + + /**** + * 长度（单位米） + */ + public String getRescue_target_length() { + return this.rescue_target_length; + } + + /**** + * 长度（单位米） + */ + public void setRescue_target_length(String rescue_target_length) { + this.rescue_target_length = rescue_target_length; + } + + /**** + * 高度（单位米） + */ + public String getRescue_target_height() { + return this.rescue_target_height; + } + + /**** + * 高度（单位米） + */ + public void setRescue_target_height(String rescue_target_height) { + this.rescue_target_height = rescue_target_height; + } + + /**** + * 搜寻处置目标重量（空气中）kg/吨 + */ + public String getRescue_air_weight() { + return this.rescue_air_weight; + } + + /**** + * 搜寻处置目标重量（空气中）kg/吨 + */ + public void setRescue_air_weight(String rescue_air_weight) { + this.rescue_air_weight = rescue_air_weight; + } + + /**** + * 搜寻处置目标重量（水中）kg/吨 + */ + public String getRescue_water_weight() { + return this.rescue_water_weight; + } + + /**** + * 搜寻处置目标重量（水中）kg/吨 + */ + public void setRescue_water_weight(String rescue_water_weight) { + this.rescue_water_weight = rescue_water_weight; + } + + /**** + * 搜寻处置目标水深（米） + */ + public String getRescue_water_depth() { + return this.rescue_water_depth; + } + + /**** + * 搜寻处置目标水深（米） + */ + public void setRescue_water_depth(String rescue_water_depth) { + this.rescue_water_depth = rescue_water_depth; + } + + /**** + * 搜寻处置目标预估价值 + * + */ + public String getRescue_target_price() { + return this.rescue_target_price; + } + + /**** + * 搜寻处置目标预估价值 + * + */ + public void setRescue_target_price(String rescue_target_price) { + this.rescue_target_price = rescue_target_price; + } + + /**** + * 快速响应等级 + * + */ + public String getRescue_response_level() { + return this.rescue_response_level; + } + + /**** + * 快速响应等级 + * + */ + public void setRescue_response_level(String rescue_response_level) { + this.rescue_response_level = rescue_response_level; + } + + /**** + * 是否涉密 + * + */ + public String getRescue_secrecy() { + return this.rescue_secrecy; + } + + /**** + * 是否涉密 + * + */ + public void setRescue_secrecy(String rescue_secrecy) { + this.rescue_secrecy = rescue_secrecy; + } + + /**** + * 搜捞目标的所属单位，手动录入 + * + */ + public String getRescue_unit() { + return this.rescue_unit; + } + + /**** + * 搜捞目标的所属单位，手动录入 + * + */ + public void setRescue_unit(String rescue_unit) { + this.rescue_unit = rescue_unit; + } + + /**** + * 快速响应时间要求,比如说最晚10天就要捞上来，手动录入天数 + */ + public String getRescue_response_day() { + return this.rescue_response_day; + } + + /**** + * 快速响应时间要求,比如说最晚10天就要捞上来，手动录入天数 + */ + public void setRescue_response_day(String rescue_response_day) { + this.rescue_response_day = rescue_response_day; + } + + /**** + * 填报时间 + * + */ + public LocalDateTime getFill_time() { + return this.fill_time; + } + + /**** + * 填报时间 + * + */ + public void setFill_time(LocalDateTime fill_time) { + this.fill_time = fill_time; + } + + /**** + * 联系人信息 + * + */ + public String getFill_person() { + return this.fill_person; + } + + /**** + * 联系人信息 + * + */ + public void setFill_person(String fill_person) { + this.fill_person = fill_person; + } + + /**** + * 填报电话 + */ + public String getFill_tel() { + return this.fill_tel; + } + + /**** + * 填报电话 + */ + public void setFill_tel(String fill_tel) { + this.fill_tel = fill_tel; + } + + /**** + * 备注 + */ + public String getRescue_note() { + return this.rescue_note; + } + + /**** + * 备注 + */ + public void setRescue_note(String rescue_note) { + this.rescue_note = rescue_note; + } + + /**** + * 填报说明 + */ + public String getFill_note() { + return this.fill_note; + } + + /**** + * 填报说明 + */ + public void setFill_note(String fill_note) { + this.fill_note = fill_note; + } + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueRegFile.java b/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueRegFile.java index ba17b9e..e59f717 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueRegFile.java +++ b/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueRegFile.java @@ -1,122 +1,122 @@ -package cn.tsy.data.cas.idsse.rescue.model; - -import cn.hme.framework.jdbc.core.HmeTable; - -/********************************************** -* 应急救援：附件信息 -* @author: ZhangXiaoQing -* @date: 2025-10-28 23:37:47 -* @version: v3.2025 -* @email: revisit@126.com -* @Company: www.hmesoft.cn -*/ -@HmeTable(name = "RESCUE_REG_FILE", key={"TSY_ID"}) -public class RescueRegFile{ - private Integer tsy_id; - //应急编号 - private Integer rescue_id; - //附件原始名称 - private String file_org_name; - //附件真实名称 - private String file_real_name; - //全路径 - private String file_path; - //文件大小 - private String file_length; - //备注信息 - private String file_note; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 应急编号 - */ - public Integer getRescue_id() { - return this.rescue_id; - } - - /**** - * 应急编号 - */ - public void setRescue_id(Integer rescue_id) { - this.rescue_id = rescue_id; - } - - /**** - * 附件原始名称 - */ - public String getFile_org_name() { - return this.file_org_name; - } - - /**** - * 附件原始名称 - */ - public void setFile_org_name(String file_org_name) { - this.file_org_name = file_org_name; - } - - /**** - * 附件真实名称 - */ - public String getFile_real_name() { - return this.file_real_name; - } - - /**** - * 附件真实名称 - */ - public void setFile_real_name(String file_real_name) { - this.file_real_name = file_real_name; - } - - /**** - * 全路径 - */ - public String getFile_path() { - return this.file_path; - } - - /**** - * 全路径 - */ - public void setFile_path(String file_path) { - this.file_path = file_path; - } - - /**** - * 文件大小 - */ - public String getFile_length() { - return this.file_length; - } - - /**** - * 文件大小 - */ - public void setFile_length(String file_length) { - this.file_length = file_length; - } - - /**** - * 备注信息 - */ - public String getFile_note() { - return this.file_note; - } - - /**** - * 备注信息 - */ - public void setFile_note(String file_note) { - this.file_note = file_note; - } - - +package cn.tsy.data.cas.idsse.rescue.model; + +import cn.hme.framework.jdbc.core.HmeTable; + +/********************************************** +* 应急救援：附件信息 +* @author: ZhangXiaoQing +* @date: 2025-10-28 23:37:47 +* @version: v3.2025 +* @email: revisit@126.com +* @Company: www.hmesoft.cn +*/ +@HmeTable(name = "RESCUE_REG_FILE", key={"TSY_ID"}) +public class RescueRegFile{ + private Integer tsy_id; + //应急编号 + private Integer rescue_id; + //附件原始名称 + private String file_org_name; + //附件真实名称 + private String file_real_name; + //全路径 + private String file_path; + //文件大小 + private String file_length; + //备注信息 + private String file_note; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 应急编号 + */ + public Integer getRescue_id() { + return this.rescue_id; + } + + /**** + * 应急编号 + */ + public void setRescue_id(Integer rescue_id) { + this.rescue_id = rescue_id; + } + + /**** + * 附件原始名称 + */ + public String getFile_org_name() { + return this.file_org_name; + } + + /**** + * 附件原始名称 + */ + public void setFile_org_name(String file_org_name) { + this.file_org_name = file_org_name; + } + + /**** + * 附件真实名称 + */ + public String getFile_real_name() { + return this.file_real_name; + } + + /**** + * 附件真实名称 + */ + public void setFile_real_name(String file_real_name) { + this.file_real_name = file_real_name; + } + + /**** + * 全路径 + */ + public String getFile_path() { + return this.file_path; + } + + /**** + * 全路径 + */ + public void setFile_path(String file_path) { + this.file_path = file_path; + } + + /**** + * 文件大小 + */ + public String getFile_length() { + return this.file_length; + } + + /**** + * 文件大小 + */ + public void setFile_length(String file_length) { + this.file_length = file_length; + } + + /**** + * 备注信息 + */ + public String getFile_note() { + return this.file_note; + } + + /**** + * 备注信息 + */ + public void setFile_note(String file_note) { + this.file_note = file_note; + } + + } \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueRegSample.java b/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueRegSample.java index c5f94eb..2f72fdd 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueRegSample.java +++ b/src/main/java/cn/tsy/data/cas/idsse/rescue/model/RescueRegSample.java @@ -1,204 +1,204 @@ -package cn.tsy.data.cas.idsse.rescue.model; - -import java.time.LocalDateTime; - -import cn.hme.framework.jdbc.core.HmeTable; - -/********************************************** - * 救援任务关联的航次和样品 - * - * @author: ZhangXiaoQing - * @date: 2025-10-28 23:41:11 - * @version: v3.2025 - * @email: revisit@126.com - * @Company: www.hmesoft.cn - */ -@HmeTable(name = "RESCUE_REG_SAMPLE", key = { "TSY_ID" }) -public class RescueRegSample { - private Integer tsy_id; - //应急救援编号 - private Integer rescue_id; - //航次编号 - private Integer voyage_id; - //航次名称 - private String voyage_name; - //数据集id - private Integer dataset_id; - //样品集名称 - private String dataset_name; - //样品id - private Integer sample_id; - //样品名称 - private String sample_name; - //覆盖面积 - private Integer conver_area; - //关联日期 - private LocalDateTime create_time; - //航线里程 - private Integer voyage_mileage; - //潜次号 - private String diving_sn; - - public Integer getTsy_id() { - return this.tsy_id; - } - - public void setTsy_id(Integer tsy_id) { - this.tsy_id = tsy_id; - } - - /**** - * 应急救援编号 - */ - public Integer getRescue_id() { - return this.rescue_id; - } - - /**** - * 应急救援编号 - */ - public void setRescue_id(Integer rescue_id) { - this.rescue_id = rescue_id; - } - - /**** - * 航次编号 - */ - public Integer getVoyage_id() { - return this.voyage_id; - } - - /**** - * 航次编号 - */ - public void setVoyage_id(Integer voyage_id) { - this.voyage_id = voyage_id; - } - - /**** - * 航次名称 - */ - public String getVoyage_name() { - return this.voyage_name; - } - - /**** - * 航次名称 - */ - public void setVoyage_name(String voyage_name) { - this.voyage_name = voyage_name; - } - - /**** - * 数据集id - */ - public Integer getDataset_id() { - return this.dataset_id; - } - - /**** - * 数据集id - */ - public void setDataset_id(Integer dataset_id) { - this.dataset_id = dataset_id; - } - - /**** - * 样品集名称 - */ - public String getDataset_name() { - return this.dataset_name; - } - - /**** - * 样品集名称 - */ - public void setDataset_name(String dataset_name) { - this.dataset_name = dataset_name; - } - - /**** - * 样品id - */ - public Integer getSample_id() { - return this.sample_id; - } - - /**** - * 样品id - */ - public void setSample_id(Integer sample_id) { - this.sample_id = sample_id; - } - - /**** - * 样品名称 - */ - public String getSample_name() { - return this.sample_name; - } - - /**** - * 样品名称 - */ - public void setSample_name(String sample_name) { - this.sample_name = sample_name; - } - - /**** - * 覆盖面积 - */ - public Integer getConver_area() { - return this.conver_area; - } - - /**** - * 覆盖面积 - */ - public void setConver_area(Integer conver_area) { - this.conver_area = conver_area; - } - - /**** - * 关联日期 - */ - public LocalDateTime getCreate_time() { - return this.create_time; - } - - /**** - * 关联日期 - */ - public void setCreate_time(LocalDateTime create_time) { - this.create_time = create_time; - } - - /**** - * 航线里程 - */ - public Integer getVoyage_mileage() { - return this.voyage_mileage; - } - - /**** - * 航线里程 - */ - public void setVoyage_mileage(Integer voyage_mileage) { - this.voyage_mileage = voyage_mileage; - } - - /**** - * 潜次号 - */ - public String getDiving_sn() { - return this.diving_sn; - } - - /**** - * 潜次号 - */ - public void setDiving_sn(String diving_sn) { - this.diving_sn = diving_sn; - } - +package cn.tsy.data.cas.idsse.rescue.model; + +import java.time.LocalDateTime; + +import cn.hme.framework.jdbc.core.HmeTable; + +/********************************************** + * 救援任务关联的航次和样品 + * + * @author: ZhangXiaoQing + * @date: 2025-10-28 23:41:11 + * @version: v3.2025 + * @email: revisit@126.com + * @Company: www.hmesoft.cn + */ +@HmeTable(name = "RESCUE_REG_SAMPLE", key = { "TSY_ID" }) +public class RescueRegSample { + private Integer tsy_id; + //应急救援编号 + private Integer rescue_id; + //航次编号 + private Integer voyage_id; + //航次名称 + private String voyage_name; + //数据集id + private Integer dataset_id; + //样品集名称 + private String dataset_name; + //样品id + private Integer sample_id; + //样品名称 + private String sample_name; + //覆盖面积 + private Integer conver_area; + //关联日期 + private LocalDateTime create_time; + //航线里程 + private Integer voyage_mileage; + //潜次号 + private String diving_sn; + + public Integer getTsy_id() { + return this.tsy_id; + } + + public void setTsy_id(Integer tsy_id) { + this.tsy_id = tsy_id; + } + + /**** + * 应急救援编号 + */ + public Integer getRescue_id() { + return this.rescue_id; + } + + /**** + * 应急救援编号 + */ + public void setRescue_id(Integer rescue_id) { + this.rescue_id = rescue_id; + } + + /**** + * 航次编号 + */ + public Integer getVoyage_id() { + return this.voyage_id; + } + + /**** + * 航次编号 + */ + public void setVoyage_id(Integer voyage_id) { + this.voyage_id = voyage_id; + } + + /**** + * 航次名称 + */ + public String getVoyage_name() { + return this.voyage_name; + } + + /**** + * 航次名称 + */ + public void setVoyage_name(String voyage_name) { + this.voyage_name = voyage_name; + } + + /**** + * 数据集id + */ + public Integer getDataset_id() { + return this.dataset_id; + } + + /**** + * 数据集id + */ + public void setDataset_id(Integer dataset_id) { + this.dataset_id = dataset_id; + } + + /**** + * 样品集名称 + */ + public String getDataset_name() { + return this.dataset_name; + } + + /**** + * 样品集名称 + */ + public void setDataset_name(String dataset_name) { + this.dataset_name = dataset_name; + } + + /**** + * 样品id + */ + public Integer getSample_id() { + return this.sample_id; + } + + /**** + * 样品id + */ + public void setSample_id(Integer sample_id) { + this.sample_id = sample_id; + } + + /**** + * 样品名称 + */ + public String getSample_name() { + return this.sample_name; + } + + /**** + * 样品名称 + */ + public void setSample_name(String sample_name) { + this.sample_name = sample_name; + } + + /**** + * 覆盖面积 + */ + public Integer getConver_area() { + return this.conver_area; + } + + /**** + * 覆盖面积 + */ + public void setConver_area(Integer conver_area) { + this.conver_area = conver_area; + } + + /**** + * 关联日期 + */ + public LocalDateTime getCreate_time() { + return this.create_time; + } + + /**** + * 关联日期 + */ + public void setCreate_time(LocalDateTime create_time) { + this.create_time = create_time; + } + + /**** + * 航线里程 + */ + public Integer getVoyage_mileage() { + return this.voyage_mileage; + } + + /**** + * 航线里程 + */ + public void setVoyage_mileage(Integer voyage_mileage) { + this.voyage_mileage = voyage_mileage; + } + + /**** + * 潜次号 + */ + public String getDiving_sn() { + return this.diving_sn; + } + + /**** + * 潜次号 + */ + public void setDiving_sn(String diving_sn) { + this.diving_sn = diving_sn; + } + } \ No newline at end of file diff --git a/src/main/java/jdbc.properties b/src/main/java/jdbc.properties index 887fcc1..66fbb9d 100644 --- a/src/main/java/jdbc.properties +++ b/src/main/java/jdbc.properties @@ -1,18 +1,18 @@ -#JdbcUrl=jdbc:mysql://116.211.2.76:65206/aigg2025?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true -#JdbcUser=root -#JdbcPassword=hm2022 - -JdbcUrl=jdbc:postgresql://1.95.42.191:5432/idsse_rescue -JdbcUser=postgres -JdbcPassword=a654321a - -#JdbcUrl=jdbc:mysql://1.95.42.191:3306/xacom_tk?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true -#JdbcUser=root -#JdbcPassword=a654321a -JdbcCheckouttimeout=30000 -JdbcMaxpoolsize=200 - -#test.JdbcDriverClass=org.sqlite.JDBC -#test.JdbcUrl=jdbc:sqlite://d:\\gopmas.db -#test.JdbcCheckouttimeout=30000 +#JdbcUrl=jdbc:mysql://116.211.2.76:65206/aigg2025?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true +#JdbcUser=root +#JdbcPassword=hm2022 + +JdbcUrl=jdbc:postgresql://1.95.42.191:5432/idsse_rescue +JdbcUser=postgres +JdbcPassword=a654321a + +#JdbcUrl=jdbc:mysql://1.95.42.191:3306/xacom_tk?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&verifyServerCertificate=false&autoReconnct=true&autoReconnectForPools=true&allowMultiQueries=true&allowPublicKeyRetrieval=true +#JdbcUser=root +#JdbcPassword=a654321a +JdbcCheckouttimeout=30000 +JdbcMaxpoolsize=200 + +#test.JdbcDriverClass=org.sqlite.JDBC +#test.JdbcUrl=jdbc:sqlite://d:\\gopmas.db +#test.JdbcCheckouttimeout=30000 #test.JdbcMaxpoolsize=200 \ No newline at end of file diff --git a/src/main/webapp/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF index 254272e..5e94951 100644 --- a/src/main/webapp/META-INF/MANIFEST.MF +++ b/src/main/webapp/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ -Manifest-Version: 1.0 -Class-Path: - +Manifest-Version: 1.0 +Class-Path: +