Skip to content

C
cloud-fb
Commit 256444e1 by 高晓磊
Options

修改安全日志的UUID,对员工违规 生产线违规 船只违规 添加违规类型字段

parent 5e15db05
Showing with 693 additions and 246 deletions
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/datamodel/PersonnelViolation.mk
......@@ -10,78 +10,78 @@
<tablePrefix>xyst_dinas_safe_</tablePrefix>
</header>
<content>
<dataModel id='672bc2a4-c62d-4eeb-96ec-490ff61814fd' multiVersion='' domainInherit='undefined'
<dataModel id='0564a8be-b90f-49b9-b79a-0a5a6ed831c2' multiVersion='' domainInherit='undefined'
tableName='xyst_dinas_safe_vehicle_violation'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='371cddc8-f106-4159-9a97-c992f35e6180' name='regionalCompany' columnName='regional_company_id'
<attribute id='45a1cf03-b7ca-4de0-9ef0-2a50ad82d421' name='regionalCompany' columnName='regional_company_id'
title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision=''
isArray='false'>
<annotation id='ab1b954f-4823-471c-a837-6c25900f5ceb' attributeId='d4c7724b-ab0f-4761-ac85-bd9c10b6a231'
<annotation id='86bb2816-3a97-47e3-9fc8-d92fd9e509bb' attributeId='4bbb8a4d-fb16-4962-b3ab-a0db15f49a60'
name='length' value='undefined'>
</annotation>
<annotation id='66b4626f-a47d-458d-9af9-cba278088e76' attributeId='345b4e0f-197d-4ca9-80b8-37408e290d5c'
<annotation id='2a10ea4b-d2d2-44f0-b9d1-a6fb2677c8c7' attributeId='1abc4fa9-fc3e-4af4-b1c1-e17dc0339f23'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='4f749581-9014-4c7f-8218-5f877dfd15a7' name='personnelName' columnName='personnel_name' title='姓名' type='string' default='' precision='' isArray='false'>
<annotation id='fb6ac167-04b1-459c-8ef7-e1d2f96a8c03' attributeId='da987d46-950e-445e-9fc2-0b22131f6856'
<attribute id='ea2f035f-2415-4eb1-9857-b2cb8dc1a346' name='personnelName' columnName='personnel_name' title='姓名' type='string' default='' precision='' isArray='false'>
<annotation id='2ab06a7f-9b83-486f-9348-775470ba9298' attributeId='3b992793-84ce-4dfa-9e05-ae3f633c873c'
name='length' value='20'/>
</attribute>
<attribute id='f953484b-6fdd-4306-8369-6f283ae3e820' name='idCard' columnName='id_card' title='身份证' type='string' default='' precision='' isArray='false'>
<annotation id='67c8f2d7-aa2d-4192-b2e5-8e385e007e31' attributeId='6d6b0b9d-fb72-4aa1-80d1-ca339ce72a09'
<attribute id='b149a720-f2c4-46b6-a323-e91ef09fa6be' name='idCard' columnName='id_card' title='身份证' type='string' default='' precision='' isArray='false'>
<annotation id='9710a1dc-11b9-42b4-bc5f-5cc9395b7ec2' attributeId='31d2ae7b-0a1f-4f51-9b5d-871ae5b46a0d'
name='length' value='30'/>
</attribute>
<attribute id='623972c4-1882-475a-96cd-81e5e10d2aea' name='createWarehouseUser' columnName='create_warehouse_user_id'
<attribute id='4293ce99-246c-45b7-9166-1fc26f94c4cb' name='createWarehouseUser' columnName='create_warehouse_user_id'
title='创建人(场站)' type='com.beecode.inz.basis.datamodel.WarehouseUser' default='' precision=''
isArray='false'>
<annotation id='b26a486e-8fb8-4b54-abb1-f67b0234b034' attributeId='82bb993d-1629-40e6-9646-c24e65d163ad'
<annotation id='0a2e941c-a4e7-4dcc-a7a8-125862cb505e' attributeId='0eff66ea-4fd6-418d-8dad-08a987070a6b'
name='length' value='undefined'>
</annotation>
<annotation id='5238976d-3f12-47e9-9664-41073cc139ee' attributeId='8443b52b-7c6e-415c-b816-a7d828fd19c1'
<annotation id='cf8cea6c-ed73-42f9-8a09-182e3dc4c240' attributeId='d6020d5a-c39e-422d-94f4-e34fc244c94b'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='4a4bd684-11ff-432b-a339-46a4edf446ed' name='updateWarehouseUser' columnName='update_warehouse_user_id'
<attribute id='0a834fb6-dbea-4f37-ad82-9bd75625c532' name='updateWarehouseUser' columnName='update_warehouse_user_id'
title='修改人(场站)' type='com.beecode.inz.basis.datamodel.WarehouseUser' default='' precision=''
isArray='false'>
<annotation id='a2af779c-9c5f-469b-861c-f7701a0599da' attributeId='2307064c-b773-4285-ab30-6eaa49426197'
<annotation id='04695538-cdaf-4cbf-92ec-6382500d1eb9' attributeId='e99536a3-e1f9-4efd-8b08-a776b33ee19d'
name='length' value='undefined'>
</annotation>
<annotation id='49057985-fccb-46ec-8580-20ef1d0b9c06' attributeId='74d98254-bc27-4128-9a09-bdb09db469b2'
<annotation id='d8a084eb-459b-4fff-85fa-34b144655046' attributeId='aed5d068-9bd0-439a-b1ac-e6a60c6db0f7'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='a5c7114a-ac23-4e38-a135-211812039e43' name='stationId' columnName='station_id'
<attribute id='2e821a71-6ba9-408d-8d94-fada04f4a13a' name='stationId' columnName='station_id'
title='场站,如果不是场站新增则添加0x000的值,方便前台查询' type='string' default='0x00000000000000000000000000000000' precision='' isArray='false'>
<annotation id='6b25b8f6-20ae-4e38-80b3-4ef9c3cb4b36' attributeId='c3b484fb-89f5-4db7-85e1-5a57e9a71c5e'
<annotation id='85936a95-71f4-4dd6-a03c-4082b9bfd415' attributeId='27477dce-b152-43c7-9290-25f9eb4c8509'
name='length' value='16'>
</annotation>
</attribute>
<attribute id='37235ed3-18bd-46a6-a4c0-a4bcacb2b560' name='violationDate' columnName='violation_date'
<attribute id='bdf37aff-6232-43b2-9dbf-242191ea897c' name='violationDate' columnName='violation_date'
title='违规时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='aa6e3bc5-016c-4858-ab92-63a65c1085ec' attributeId='60c6e2c7-2b73-41a7-96af-7d40e37d07fd'
<annotation id='af4b7fd6-07a6-4ec0-a7a0-5f2ec39e3c92' attributeId='ef1b3f98-1f58-4419-ad34-630109fc6c18'
name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='e2570383-c83b-4cbe-8302-e704635177b7' name='violationDescription' columnName='violation_description'
<attribute id='7c654355-b182-4f35-a4ca-3a28e938f189' name='violationDescription' columnName='violation_description'
title='违规描述' type='string' default='' precision='' isArray='false'>
<annotation id='91fd9fc6-e4a7-4f55-8526-a2af0d0e65ea' attributeId='21217046-bb7b-470d-88b5-d898cf134142'
<annotation id='3741b2ca-b2ec-4bf9-b94c-0a9d4cd7fc94' attributeId='c52f901a-d072-455a-aca8-ee57981e9c7e'
name='length' value='500'>
</annotation>
</attribute>
<attribute id='6985f6e8-1717-4a43-b759-ae614c1425eb' name='processResult' columnName='process_result'
<attribute id='deca78cc-c303-4b22-b0b3-e8a54ff3d88e' name='processResult' columnName='process_result'
title='违规处理结果' type='string' default='' precision='' isArray='false'>
<annotation id='106637cb-9978-4de0-9a67-b7367a08e819' attributeId='81f76787-e07d-4545-b624-598de03b20c3'
<annotation id='98475a54-a366-4eda-aac6-dfc5e25cdff5' attributeId='8db217bd-8408-44e6-8c06-716b76a68447'
name='length' value='500'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.safe/src/main/resources/config/PersonnelViolation.hbm.xml</hibernate>
</dataModel>
</content>
</model>
\ No newline at end of file
</model>
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/datamodel/ProductionLineViolation.mk
......@@ -11,51 +11,61 @@
<tablePrefix>xyst_dinas_safe_</tablePrefix>
</header>
<content>
<dataModel id='704835f3-ad07-4611-ae3c-aa0b1baeeb60' multiVersion='' domainInherit='undefined'
<dataModel id='105564b1-94ef-4ddc-998a-3443172acb83' multiVersion='' domainInherit='undefined'
tableName='xyst_dinas_safe_production_line_violation'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='14d0ad20-c71d-4904-9ff1-35865605c185' name='regionalCompany' columnName='regional_company_id'
<attribute id='69e27aa5-6f75-46a6-8f76-229bf6615249' name='regionalCompany' columnName='regional_company_id'
title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision=''
isArray='false'>
<annotation id='99ab86cd-74b8-4d71-9cc9-d7f5286bc82a' attributeId='f9b5839f-3482-47f0-a7bb-eeeccd32a847'
<annotation id='b279dd12-7d56-4420-9e7f-2a7d9ec25249' attributeId='8af0ceb7-45a6-4d1a-b0b1-5f0db9257a3a'
name='length' value='undefined'>
</annotation>
<annotation id='7d3ebfcf-7619-46e9-af4d-33f18ec16c70' attributeId='31b655a3-fef4-4b56-ad9c-16cc44856497'
<annotation id='aaadee43-2ac9-440a-9363-98a93af1d6f4' attributeId='95361423-61fd-4a6c-ada6-6884365bc79b'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='ed3bf08a-0ce8-4cb2-8523-b5934b4fd5c4' name='productionLine' columnName='production_line_id' title='所属生产线'
<attribute id='2df45891-4647-4cbe-9719-6ce3ebb0efbe' name='productionLine' columnName='production_line_id' title='所属生产线'
type='com.xyst.dinas.biz.datamodel.ProductionLine' default='' precision='' isArray='false'>
<annotation id='fcf73b77-ee5d-4d94-a846-71acef2c2406' attributeId='a89ffcf7-1c53-4912-ab2b-ca93336daf2b'
<annotation id='b52d5527-5465-4f05-8cbd-fd083680dc98' attributeId='60a15822-af9c-4462-82b6-fa21979ff724'
name='length' value='undefined'>
</annotation>
<annotation id='e6688807-0dc7-4c02-93f5-bc8adead861a' attributeId='11ab11bf-0465-44ed-9d4e-b948abacf099'
<annotation id='c670f4d9-117a-4b0a-83f8-589eb6b02412' attributeId='5ad9b1f3-2f6b-4926-9fe9-af45e7316877'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='0eaa2711-94f9-4b97-95f8-521d263b6249' name='violationDate' columnName='violation_date'
<attribute id='7e77c67b-8fbb-4447-bbbb-abe673d0e455' name='violationType' columnName='violation_type_id' title='违规类型Id'
type='com.xyst.dinas.safe.datamodel.ViolationType' default='' precision='' isArray='false'>
<annotation id='94a3fe84-dee5-43e2-80d9-cb220e134f68' attributeId='6c53ff9f-3d95-42d3-ac1c-dc4855b0cc34'
name='length' value='undefined'>
</annotation>
<annotation id='0b0ad94b-063a-4aba-abf4-1061ee8bdfbf' attributeId='b36d699a-7733-4369-9056-d57fbbea6341'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='2f678e64-2f7f-4183-b6e5-c026c0d85ad0' name='violationDate' columnName='violation_date'
title='违规时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='db64013d-237d-4afe-a4a1-d16c5a781b54' attributeId='9ce31cad-5cef-47e1-99e7-595cc036bd0d'
<annotation id='808fc46f-9d8c-45b8-90a8-9cdb74b4ea13' attributeId='c25cd1c6-79e4-418f-b7cc-bd1b8564156c'
name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='bbf1ce23-a27a-497f-99f5-076a64a35f1c' name='violationDescription' columnName='violation_description'
<attribute id='829f20a5-a4aa-4c58-8d35-58921cbd70bf' name='violationDescription' columnName='violation_description'
title='违规描述' type='string' default='' precision='' isArray='false'>
<annotation id='3f51bbb5-271f-403f-8747-122fa606bc93' attributeId='f18d4517-fc96-4d4b-bb97-f680587d2f30'
<annotation id='b6aec006-0aa3-4111-9e6c-b091ad438299' attributeId='41b74c32-22db-4b5c-97bb-a8e2855ca403'
name='length' value='500'>
</annotation>
</attribute>
<attribute id='8f47fb90-49a2-4eb1-aa15-f2c1a1cd620f' name='processResult' columnName='process_result'
<attribute id='803a64a2-5893-473d-ad91-7cbbf32962a3' name='processResult' columnName='process_result'
title='违规处理结果' type='string' default='' precision='' isArray='false'>
<annotation id='9b4c96d1-1eba-494d-8324-425ee7f25c49' attributeId='a66e6c9e-29a2-40e2-ad3a-b64e41e6cbbb'
<annotation id='6f7d9eb7-31a2-43dd-9ee9-eac215d68fd6' attributeId='91e0e631-d8a6-4233-90bf-77ae2cd3e16e'
name='length' value='500'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.safe/src/main/resources/config/ProductionLineViolation.hbm.xml</hibernate>
</dataModel>
</content>
</model>
\ No newline at end of file
</model>
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/datamodel/ShipViolation.mk
......@@ -10,47 +10,57 @@
<tablePrefix>xyst_dinas_safe_</tablePrefix>
</header>
<content>
<dataModel id='168e525f-2493-4296-98f0-e4d3e783065b' multiVersion='' domainInherit='undefined'
<dataModel id='c182b6ad-b8dd-4683-a331-ec6b6c125562' multiVersion='' domainInherit='undefined'
tableName='xyst_dinas_safe_ship_violation'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='f9581920-58e1-46af-a443-65c79f7be5d5' name='regionalCompany' columnName='regional_company_id'
<attribute id='c652bbd5-54e3-4661-9068-901df0b902d2' name='regionalCompany' columnName='regional_company_id'
title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision=''
isArray='false'>
<annotation id='1d2bd595-5bf1-4b59-a53a-999592fab289' attributeId='128be010-2df2-4f0b-b006-6fba8a5dfbe5'
<annotation id='ad716b20-f0bc-48fd-9a2e-ac9f0f947732' attributeId='4d21ee48-f36d-4239-a65d-928a4fecc610'
name='length' value='undefined'>
</annotation>
<annotation id='2822e9d4-c1cf-438a-bd91-188076e09c7d' attributeId='b7cef027-a3f0-4411-97ea-26532812a8bd'
<annotation id='20418f7c-cfc4-42f8-8a70-d57ce7c71b27' attributeId='767c220a-fc24-40f8-8c5f-c0c47bd4d294'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='f3133aa9-18f5-494b-946c-c1f8f6db19ba' name='shipInfo' columnName='ship_info_id' title='所属船只'
<attribute id='ed1ca10d-13e6-4aaf-a222-9c9cbc11fd2d' name='shipInfo' columnName='ship_info_id' title='所属船只'
type='com.xyst.dinas.biz.datamodel.ShipInfo' default='' precision='' isArray='false'>
<annotation id='575a43dd-917e-4252-b533-f93e4297c893' attributeId='ebc20049-7bdc-419b-a9a1-cc935f79ec19'
<annotation id='f8d4cc15-237f-4721-9ac1-179d9d0df404' attributeId='80003500-3c4f-48a6-92a0-17d39e2188de'
name='length' value='undefined'>
</annotation>
<annotation id='8761a69d-c39f-42c2-befc-d7c23ae02bf4' attributeId='019e05c7-e81e-4782-8fa0-e73120c49704'
<annotation id='51fcb396-9d23-4e5e-9e75-1a36352749ec' attributeId='d5241b75-2098-4c62-a858-0bf631cd2508'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='16d4471d-d98b-431d-8a11-a537ea951cf6' name='violationDate' columnName='violation_date'
<attribute id='4110305c-6bb4-4d46-9a91-8626ad9e66ec' name='violationType' columnName='violation_type_id' title='违规类型Id'
type='com.xyst.dinas.safe.datamodel.ViolationType' default='' precision='' isArray='false'>
<annotation id='60a9b43d-1e9b-4d64-aaa3-6271f43e9dd6' attributeId='034dfa9a-26ce-49ef-9abc-381bb5297fd8'
name='length' value='undefined'>
</annotation>
<annotation id='3303070d-b3a1-4b26-ae16-53322a3ea54e' attributeId='404c9a63-eb69-4048-b867-3b29c6b65b26'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='e6ea385d-3ef5-4540-9bc9-edeefc1924aa' name='violationDate' columnName='violation_date'
title='违规时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='cbbe0e56-6c3f-4a66-b38a-c8fe5cbf6696' attributeId='44356a26-27f4-4f2e-a3e4-5691b92327f4'
<annotation id='2ad436d1-ad04-41d4-8aea-69c2bfa04de0' attributeId='00913079-ea0e-4a38-9725-f4acc3c54d06'
name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='2cfada0b-70fe-47f1-a74e-1a4ec6f172cc' name='violationDescription' columnName='violation_description'
<attribute id='6dc03046-dc74-41f5-bf02-1fe3e5a102c6' name='violationDescription' columnName='violation_description'
title='违规描述' type='string' default='' precision='' isArray='false'>
<annotation id='7ad2d9cb-f4ec-4559-afc2-50efadba47c6' attributeId='23bae94a-c61f-4ed3-8c95-d9994b85416d'
<annotation id='1fbb9f7e-09eb-4ee9-9d31-3b822d1556f7' attributeId='e23d9edc-033f-4111-b5de-8015c8c4bd32'
name='length' value='500'>
</annotation>
</attribute>
<attribute id='af42626d-bc6c-4429-874b-c5dcf1103009' name='processResult' columnName='process_result'
<attribute id='87b6fa1d-fe93-47e1-862c-80c743a34d91' name='processResult' columnName='process_result'
title='违规处理结果' type='string' default='' precision='' isArray='false'>
<annotation id='cfb55d43-a2ad-482b-98e0-df96070de2d3' attributeId='83598f23-b4b7-4512-a80a-9f4afa6b86a2'
<annotation id='ff9b2668-63b7-4aab-aba6-7de99db3df6c' attributeId='85b2ad43-6759-4168-bfd4-a80fed6db306'
name='length' value='500'>
</annotation>
</attribute>
......
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/datamodel/StaffViolation.mk
......@@ -10,51 +10,61 @@
<tablePrefix>xyst_dinas_safe_</tablePrefix>
</header>
<content>
<dataModel id='9da68f6a-ba95-474a-81be-369d60cfa34b' multiVersion='' domainInherit='undefined'
<dataModel id='cb8acb8d-d9f9-455d-9caf-0f0e3f24b131' multiVersion='' domainInherit='undefined'
tableName='xyst_dinas_safe_staff_violation'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='49da9926-eb71-4f27-9aa2-033a6d176175' name='regionalCompany' columnName='regional_company_id'
<attribute id='27ca5768-c9a8-4340-a7a4-9399b7b29a62' name='regionalCompany' columnName='regional_company_id'
title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision=''
isArray='false'>
<annotation id='82dff403-431d-4397-9344-8f3e42f169fc' attributeId='6f4c10d9-7899-4f90-96b8-e2cc408c749e'
<annotation id='9b0223c3-85fd-45a6-9977-4cc19bb1f2a5' attributeId='26ca0b14-5dd3-4e96-b2a7-f013c178cbaf'
name='length' value='undefined'>
</annotation>
<annotation id='01f32828-c660-41c2-81ba-d93f274ef086' attributeId='5d0d77ee-fa5e-4167-aee1-f750ff38df2e'
<annotation id='3e18159b-ab9c-4f28-bc74-73baa45484d8' attributeId='3b9665f6-5966-4020-b457-916da7b9c35f'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='4cfa6f24-658b-43fc-82b0-de120c172d7c' name='staff' columnName='staff_id' title='违规人'
<attribute id='d76cffcc-36bd-47ef-9d99-6373ca472f1b' name='staff' columnName='staff_id' title='违规人'
type='com.beecode.bap.staff.datamodel.Staff' default='' precision='' isArray='false'>
<annotation id='01ff35a1-9a6f-4760-bffb-dfd83f663021' attributeId='98c43cc8-0003-424d-9253-d65620c661e8'
<annotation id='00e2d2df-7788-4c13-98e8-2de071f47663' attributeId='a92cf345-ce4a-4a1e-b28a-2abb2dfb5e3d'
name='length' value='undefined'>
</annotation>
<annotation id='a3c651af-2e93-43b6-9603-a44500ada7c2' attributeId='8969e4dd-3b20-4464-ae21-f98cd1611ccf'
<annotation id='39d77cb1-0c39-453a-902a-f65b67ccfe3c' attributeId='70d7be5b-4ec8-4d82-a925-c9261c1ec6a1'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='6ca43015-8960-4576-b85e-2480381bf042' name='violationDate' columnName='violation_date'
<attribute id='1ce69912-1c00-4338-8179-e53812786f9f' name='violationType' columnName='violation_type_id' title='违规类型Id'
type='com.xyst.dinas.safe.datamodel.ViolationType' default='' precision='' isArray='false'>
<annotation id='c7f7d972-3909-46f1-9fca-305d4cb2e6fc' attributeId='590a78e2-0c46-4713-a52e-cb29d2a88032'
name='length' value='undefined'>
</annotation>
<annotation id='a07949fd-4c2a-4919-ac25-421f31691a77' attributeId='2475cbcd-24e5-4c57-b53f-96d088bc4f18'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='b73aac14-2dab-4248-a63c-06d75c8256e4' name='violationDate' columnName='violation_date'
title='违规时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='2ea71949-10e0-49c4-a231-69b05535e104' attributeId='7c149080-ba01-476d-9f40-18cfa6e8ecce'
<annotation id='1e438839-23d2-407f-a54a-92ff8702976e' attributeId='cbfa02d4-4390-4a73-b350-f6ee66582442'
name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='f8e78059-8e53-4110-86ad-f27c4dce72c3' name='violationDescription' columnName='violation_description'
<attribute id='2508f399-947c-47b5-97a2-be718d2bc207' name='violationDescription' columnName='violation_description'
title='违规描述' type='string' default='' precision='' isArray='false'>
<annotation id='816f1d37-e27c-4232-acda-ed65b9969e90' attributeId='89dd5e85-4c22-4445-bc74-5f14e08a8565'
<annotation id='8b912097-c037-4f91-9579-7e643946dd0c' attributeId='39804375-309a-48cd-bca9-45d73b2bbb79'
name='length' value='500'>
</annotation>
</attribute>
<attribute id='bf181e8d-52fa-495d-b08b-e65cea56a679' name='processResult' columnName='process_result'
<attribute id='a61125e4-05f9-4408-827d-86d927b43a30' name='processResult' columnName='process_result'
title='违规处理结果' type='string' default='' precision='' isArray='false'>
<annotation id='6e8b7645-ac48-4891-ac52-30a08bfd7d78' attributeId='c82f406c-7422-4f4b-b630-eeb2c64a4dc2'
<annotation id='e6f2878c-b203-4a40-97d1-2297e292b102' attributeId='75d14c29-8d83-4156-88ef-0d2f1ee20fd6'
name='length' value='500'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.safe/src/main/resources/config/StaffViolation.hbm.xml</hibernate>
</dataModel>
</content>
</model>
\ No newline at end of file
</model>
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/datamodel/TrainingEducation.mk
......@@ -11,60 +11,60 @@
<tablePrefix>xyst_dinas_safe_</tablePrefix>
</header>
<content>
<dataModel id='75738fec-3b4a-4279-9f30-cbddccd7f785' multiVersion='' domainInherit='undefined'
<dataModel id='985addc1-6b95-4ae6-99ce-9dc1504ddf42' multiVersion='' domainInherit='undefined'
tableName='xyst_dinas_safe_training_education'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='715a6cb7-4ae2-485d-8c70-0b8702b3afe5' name='regionalCompany' columnName='regional_company_id'
<attribute id='224037bf-f458-46fc-9a12-35c0b0597f0f' name='regionalCompany' columnName='regional_company_id'
title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision=''
isArray='false'>
<annotation id='25a2a853-96d8-4384-a737-ff4764d9bbca' attributeId='27e0a076-0ec2-4f1d-89d7-3fa3af16417f'
<annotation id='0b75db77-0ced-4b5a-b178-15765b5667c5' attributeId='642b1c4b-34a0-446b-aee9-bf6c256cfe0c'
name='length' value='undefined'>
</annotation>
<annotation id='91e988fe-4793-4f17-b435-3ad20c1e00a6' attributeId='d1919ee2-18f0-4e71-b35a-dfe7fe814cf2'
<annotation id='49f60176-18b2-4a4e-9be4-17534fdb3150' attributeId='94bafad3-3e03-4e22-9019-e0db9ca9eb5f'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='8464c1ff-9cc1-471d-9a63-50cb4f748910' name='educationDate' columnName='education_date'
<attribute id='41481608-92cf-4e87-8a7c-6b41ac50d52e' name='educationDate' columnName='education_date'
title='培训日期' type='datetime' default='' precision='' isArray='false'>
<annotation id='c0055ded-47ef-4eca-afc6-31953c0a3a96' attributeId='61641ecc-c2a1-4e0d-84d1-88a44e6d418d'
<annotation id='8b3ca26e-3058-4725-9225-7f3ae887e040' attributeId='24401ee9-b1a5-4ff7-9522-98c82865eeca'
name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='6fb592f5-89b0-435a-b905-0619011580e5' name='trainingEducationName' columnName='training_education_name'
<attribute id='5693f5e7-b71b-43c4-9a68-f53d8469f475' name='trainingEducationName' columnName='training_education_name'
title='培训会议名称' type='string' default='' precision='' isArray='false'>
<annotation id='40d7c5f3-4967-47b0-bb55-07435f80c56e' attributeId='0f8a381a-de4e-4b96-b995-5e5abcc80e23'
<annotation id='efcf0b1f-9bcb-477b-94ca-1f74935e49aa' attributeId='9b3f4dec-c668-4ab8-aedd-9756ec41a412'
name='length' value='500'>
</annotation>
</attribute>
<attribute id='a5288451-8649-4139-816d-8a043c24a1c4' name='participantsCount' columnName='participants_count'
<attribute id='f7543bd3-cf9b-422d-ba1c-997325304dce' name='participantsCount' columnName='participants_count'
title='参会人数' type='int' default='' precision='' isArray='false'>
<annotation id='7d48cd9f-e40d-46c1-98c3-d2a56ab5e20c' attributeId='d8d07318-4d25-4cd2-8d44-7a8bb03f2c6b'
<annotation id='8af5d963-0a4d-4547-be02-be068a37c1de' attributeId='51d9e5b5-2337-42cc-8cc9-810a2e76d6be'
name='length' value='10'>
</annotation>
</attribute>
<attribute id='7a1e588c-286e-4dfc-bb4f-fca5a45f39ae' name='meetingPlace' columnName='meeting_place'
<attribute id='e7462b3b-ee27-4a87-b35d-49203ba64683' name='meetingPlace' columnName='meeting_place'
title='会议地点' type='string' default='' precision='' isArray='false'>
<annotation id='88483b58-a5d0-4b6a-96a6-8d90e02bec14' attributeId='e54458e8-4bae-420b-ac80-d3b061c208b7'
<annotation id='fc720b43-5362-41c3-a786-5ba61eb78fd9' attributeId='6796cccc-9755-4a45-b6cf-3bf89e1cf016'
name='length' value='500'>
</annotation>
</attribute>
<attribute id='35024ffb-3002-43c4-8a69-4c6bdb194e34' name='participants' columnName='participants'
<attribute id='ad2a12f3-96af-4854-b1b0-6eab8c4d1468' name='participants' columnName='participants'
title='参会人员' type='string' default='' precision='' isArray='false'>
<annotation id='5817877b-2543-464b-9b5f-2ec1c3af5a23' attributeId='2132f47d-5072-4365-8e51-3e5d0f5d5bc6'
<annotation id='2c4df9f3-e1ff-4a34-b9c4-50937f53fc0c' attributeId='d5e82eeb-af89-4d2b-b00d-2167dc60c725'
name='length' value='500'>
</annotation>
</attribute>
<attribute id='eece008b-e265-4c70-b24c-75d167c58e92' name='meetingContent' columnName='meeting_content'
<attribute id='3490fa6e-6c63-4d77-90c9-375a47e5d63c' name='meetingContent' columnName='meeting_content'
title='会议内容' type='string' default='' precision='' isArray='false'>
<annotation id='2d1fce04-3397-403e-98a0-2009788eb7b7' attributeId='1bb6e8ba-1e7d-4491-8e4f-43758c2c9d62'
<annotation id='91f1fda2-f940-40e9-a2eb-9a5a918dac70' attributeId='2b79cf0f-0413-4ef7-97f5-6cdcc4aba70a'
name='length' value='500'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.safe/src/main/resources/config/TrainingEducation.hbm.xml</hibernate>
</dataModel>
</content>
</model>
\ No newline at end of file
</model>
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/datamodel/VehicleViolation.mk
......@@ -10,71 +10,71 @@
<tablePrefix>xyst_dinas_safe_</tablePrefix>
</header>
<content>
<dataModel id='9ba68f6a-ba95-474a-81be-369d60cfa34b' multiVersion='' domainInherit='undefined'
<dataModel id='41ea7d5e-b2dd-4026-8254-fff19d9b3448' multiVersion='' domainInherit='undefined'
tableName='xyst_dinas_safe_vehicle_violation'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='49da9926-eb71-4f27-9aa2-033a6d176175' name='regionalCompany' columnName='regional_company_id'
<attribute id='dfbb05ae-68ec-45eb-9bac-e43f81adb822' name='regionalCompany' columnName='regional_company_id'
title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision=''
isArray='false'>
<annotation id='82dff403-431d-4397-9344-8f3e42f169fc' attributeId='6f4c10d9-7899-4f90-96b8-e2cc408c749e'
<annotation id='190fb1ae-bc7f-416c-846f-a1591bac3da5' attributeId='91e4292a-9b54-49f5-a779-e9a9e22cdf13'
name='length' value='undefined'>
</annotation>
<annotation id='01f32828-c660-41c2-81ba-d93f274ef086' attributeId='5d0d77ee-fa5e-4167-aee1-f750ff38df2e'
<annotation id='7e941476-5cf4-4299-81c1-c3596e2a7515' attributeId='e0acae1f-d496-499d-9fdc-b3fe387685ba'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='49da9926-eb71-4f27-9aa2-033a6d176175' name='createWarehouseUser' columnName='create_warehouse_user_id'
<attribute id='5ca73d9d-7158-4109-af43-37662eddda1c' name='createWarehouseUser' columnName='create_warehouse_user_id'
title='创建人(场站)' type='com.beecode.inz.basis.datamodel.WarehouseUser' default='' precision=''
isArray='false'>
<annotation id='82dff403-431d-4397-9344-8f3e42f169fc' attributeId='6f4c10d9-7899-4f90-96b8-e2cc408c749e'
<annotation id='8bb8d026-1a9f-4066-b26b-d4f9e9b02af7' attributeId='961d1a6f-d19d-47b2-bb2f-9f54afaddd71'
name='length' value='undefined'>
</annotation>
<annotation id='01f32828-c660-41c2-81ba-d93f274ef086' attributeId='5d0d77ee-fa5e-4167-aee1-f750ff38df2e'
<annotation id='5f1f25b4-ae31-49db-bcc7-3a5c923e4fb0' attributeId='b93d1b74-c784-4a24-9729-99e1a9538a0f'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='49da9926-eb71-4f27-9aa2-033a6d176175' name='updateWarehouseUser' columnName='update_warehouse_user_id'
<attribute id='aeaaa1eb-49a5-4d9a-b77a-049c4d638d94' name='updateWarehouseUser' columnName='update_warehouse_user_id'
title='修改人(场站)' type='com.beecode.inz.basis.datamodel.WarehouseUser' default='' precision=''
isArray='false'>
<annotation id='82dff403-431d-4397-9344-8f3e42f169fc' attributeId='6f4c10d9-7899-4f90-96b8-e2cc408c749e'
<annotation id='724af08d-0ddc-47db-9c65-7df148d06a73' attributeId='cde20828-f444-4006-b421-348e1d82e225'
name='length' value='undefined'>
</annotation>
<annotation id='01f32828-c660-41c2-81ba-d93f274ef086' attributeId='5d0d77ee-fa5e-4167-aee1-f750ff38df2e'
<annotation id='1dbffb5a-75ad-4250-9fc4-f65a3f4cf7fc' attributeId='6ab6fef6-1ced-4c5d-8d66-83e232ac1a58'
name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='6ca43015-8960-4576-b85e-2480381bf042' name='plateNumber' columnName='plate_number'
<attribute id='6e1784e7-5dc2-40a9-9cb6-9d2abda2292f' name='plateNumber' columnName='plate_number'
title='车牌号' type='string' default='' precision='' isArray='false'>
<annotation id='2ea71949-10e0-49c4-a231-69b05535e104' attributeId='7c149080-ba01-476d-9f40-18cfa6e8ecce'
<annotation id='0cde9010-45a8-4ac6-9f55-1a56bfc933b8' attributeId='366b5e93-b345-4db6-a71a-c82201517c9d'
name='length' value='30'>
</annotation>
</attribute>
<attribute id='6ca43015-8960-4576-b85e-2480381bf042' name='stationId' columnName='station_id'
<attribute id='f25ec5e3-d727-4933-bcec-5cbab2367430' name='stationId' columnName='station_id'
title='场站,如果不是场站新增则添加0x000的值,方便前台查询' type='string' default='0x00000000000000000000000000000000' precision='' isArray='false'>
<annotation id='2ea71949-10e0-49c4-a231-69b05535e104' attributeId='7c149080-ba01-476d-9f40-18cfa6e8ecce'
<annotation id='d13923fd-b11b-442a-bf0e-0f4b44919787' attributeId='6ebf556f-70c7-46e2-a371-06a4b33bd8cd'
name='length' value='16'>
</annotation>
</attribute>
<attribute id='6ca43015-8960-4576-b85e-2480381bf042' name='violationDate' columnName='violation_date'
<attribute id='dae1bedb-e6c0-47de-8bd6-c2d2f6683a83' name='violationDate' columnName='violation_date'
title='违规时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='2ea71949-10e0-49c4-a231-69b05535e104' attributeId='7c149080-ba01-476d-9f40-18cfa6e8ecce'
<annotation id='805dbd0c-f602-4ad2-98ea-912d735963e8' attributeId='073bc1c2-ab3d-40dd-8c90-49b7cac5e3b4'
name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='f8e78059-8e53-4110-86ad-f27c4dce72c3' name='violationDescription' columnName='violation_description'
<attribute id='5ffe3c63-df1c-4efd-961d-c01cc36f78d1' name='violationDescription' columnName='violation_description'
title='违规描述' type='string' default='' precision='' isArray='false'>
<annotation id='816f1d37-e27c-4232-acda-ed65b9969e90' attributeId='89dd5e85-4c22-4445-bc74-5f14e08a8565'
<annotation id='3ef0f868-1745-4e95-987a-89cc06b2349c' attributeId='c8e54b1d-1e60-4e4e-b042-d0a473c807e8'
name='length' value='500'>
</annotation>
</attribute>
<attribute id='bf181e8d-52fa-495d-b08b-e65cea56a679' name='processResult' columnName='process_result'
<attribute id='7808e38c-9de6-4840-b37a-77b0dea0c2bf' name='processResult' columnName='process_result'
title='违规处理结果' type='string' default='' precision='' isArray='false'>
<annotation id='6e8b7645-ac48-4891-ac52-30a08bfd7d78' attributeId='c82f406c-7422-4f4b-b630-eeb2c64a4dc2'
<annotation id='1774b086-21dc-422e-875c-df571ed0cdfb' attributeId='3b49b3e3-27bf-4467-b0ce-40b20145ff05'
name='length' value='500'>
</annotation>
</attribute>
......
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/datamodel/ViolationType.mk 0 → 100644
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.safe.datamodel</package>
<title>违规类型表</title>
<name>ViolationType</name>
<description>违规类型表</description>
<templateName>mk.ide.ui.editor.data.model.template.common</templateName>
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='8733e8b5-43a2-4f55-aa76-395da116ddb6' multiVersion='undefined' domainInherit='undefined' tableName='xyst_dinas_safe_violation_type'>
<parent>com.beecode.bcp.dict.datamodel.BasicDictRequirement</parent>
<attribute id='5e21feab-2ca4-4d97-bced-af7f2d75fec0' name="typeName" columnName='type_name' title='类型名称' type='string' default='' precision='' isArray='false'>
<annotation id='7f00aa69-3304-43f7-9e5e-69082c551379' attributeId='413cde2e-3c68-48f2-9071-95f15eaa4e23' name='length' value='100'>
</annotation>
</attribute>
<attribute id='62ba3f7f-326f-40ce-b8bd-ba6fed117795' name='belongViolation' columnName='belong_violation' title='所属哪个违规记录' type='int' default='' precision='' isArray='false'>
<annotation id='4491b6c0-8449-487a-b012-f1ca8c57af81' attributeId='f1e0c793-158a-4f01-8557-4e1a355aa9ed' name='length' value='1'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.fileshared/src/main/resources/config/ViolationType.hbm.xml</hibernate>
</dataModel>
</content>
</model>
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/datamodel/dict/ViolationTypeDict.mk 0 → 100644
<model>
<header>
<type>bcp.dict.Dict</type>
<package>com.xyst.dinas.safe.datamodel.dict</package>
<name>ViolationTypeDict</name>
<title>违规类型</title>
<tags></tags>
<description></description>
</header>
<content>
<dict id='4ab4e683-6509-4720-9c54-322e557523ae' listid='6d77172b-4998-4162-9901-16bf85318468'>
<type>com.xyst.dinas.safe.datamodel.ViolationType</type>
<config>
<structure>list</structure>
<code-rule></code-rule>
</config>
</dict>
</content>
</model>
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/query/PersonnelViolation.mk
......@@ -8,16 +8,16 @@
<description>人员违规记录</description>
</header>
<content>
<customQuery id='21cfaaa4-78bc-4384-9431-cd59341ad2dd'>
<customQuery id='7d0a582f-9bec-4e2a-904c-62a9f0298a78'>
<kclass>com.xyst.dinas.safe.datamodel.PersonnelViolation</kclass>
<innerScene title='全部'>
<id>94d95a10-a9b2-4431-bade-bef26b0517d3</id>
<id>711ba77b-b5f2-4367-a12f-11c7f8048ff1</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>97a318b9-61a9-46d7-bf46-5df7ca57c694</id>
<id>285cb16d-9d01-4a7e-96cf-b5a0e0f29de3</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
......@@ -182,4 +182,4 @@
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
</model>
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/query/ProductionLineViolation.mk
......@@ -9,16 +9,16 @@
<description>生产违规记录</description>
</header>
<content>
<customQuery id='a53c5642-3d85-4fd9-a13a-512975e3dfc0'>
<customQuery id='7d24edfe-a4a6-4602-855a-947ec6bfed51'>
<kclass>com.xyst.dinas.safe.datamodel.ProductionLineViolation</kclass>
<innerScene title='全部'>
<id>0c2eeafb-9939-4df9-a04b-2a839b255f74</id>
<id>4d3ad953-29ee-4b4c-9a2d-bac3aeed82a8</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>b440289a-6f56-4b5f-b401-fce17dd86176</id>
<id>d91897ad-b161-4a23-b1bc-bb0dde76d0b4</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
......@@ -41,6 +41,35 @@
</ref>
<description></description>
</field>
<field title='生产线名称'>
<name>productionLine.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.ProductionLine</name>
</ref>
<description></description>
</field>
<field title='违规类型'>
<name>violationType.id</name>
<type>uuid</type>
<ref>
<type>一般引用</type>
<name>com.xyst.dinas.safe.datamodel.ViolationType</name>
</ref>
<description></description>
</field>
<field title='违规类型名称'>
<name>violationType.typeName</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.safe.datamodel.ViolationType</name>
</ref>
<description></description>
</field>
<field>
<name>regionalCompany.id</name>
<title>区域公司</title>
......@@ -61,15 +90,6 @@
</ref>
<desc></desc>
</field>
<field title='生产线名称'>
<name>productionLine.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.ProductionLine</name>
</ref>
<description></description>
</field>
<field title='违规时间'>
<name>violationDate</name>
<type>datetime</type>
......
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/query/SafeLog.mk
......@@ -8,18 +8,18 @@
<description>安全日志</description>
</header>
<content>
<customQuery id='2cb5cdcc-d8ee-44f3-8cd2-11c2f62bff0a'>
<customQuery id='c1751da0-4126-48ed-bfe4-27aa117cb666'>
<kclass>com.xyst.dinas.safe.datamodel.SafeLog</kclass>
<dataProcessor>com.xyst.dinas.safe.internal.scene.SafeLogStaffNameInfoQueryProcessor</dataProcessor>
<innerScene title='全部'>
<id>01c6cee9-ce47-4c46-9ece-f57ea66bc601</id>
<id>31e1bcb5-a64b-4ef7-afb8-22dc3f127377</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>34921972-7319-482c-b97a-ae13172ce68f</id>
<id>1f2fb4a8-943d-4f73-915b-88254e40890a</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
......@@ -194,4 +194,4 @@
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
</model>
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/query/ShipViolation.mk
......@@ -8,16 +8,16 @@
<description>船舶违规记录</description>
</header>
<content>
<customQuery id='0591cfad-73f1-4c79-982d-ab584f0600a9'>
<customQuery id='622797ac-4e14-4850-bad2-e396d17c1086'>
<kclass>com.xyst.dinas.safe.datamodel.ShipViolation</kclass>
<innerScene title='全部'>
<id>32fe0e59-c21e-43a1-9b27-8c66a35303a8</id>
<id>8ebf0175-4f70-4ec2-b909-5c40a5b87fe1</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>a71a929f-a200-41ae-adb6-9c211eed93c1</id>
<id>7e72c8f9-12af-4960-93a5-cae1fbf05c48</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
......@@ -43,6 +43,26 @@
</ref>
<desc></desc>
</field>
<field title='违规类型'>
<name>violationType.id</name>
<type>uuid</type>
<ref>
<type>一般引用</type>
<name>com.xyst.dinas.safe.datamodel.ViolationType</name>
</ref>
<description></description>
</field>
<field title='违规类型名称'>
<name>violationType.typeName</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.safe.datamodel.ViolationType</name>
</ref>
<description></description>
</field>
<field title='id'>
<name>id</name>
<type>uuid</type>
......
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/query/StaffViolation.mk
......@@ -8,16 +8,16 @@
<description>人员违规记录</description>
</header>
<content>
<customQuery id='df798a17-851b-41ac-80a7-80e999b0d03d'>
<customQuery id='66c38443-00f6-4147-a1a6-32b6855e7745'>
<kclass>com.xyst.dinas.safe.datamodel.StaffViolation</kclass>
<innerScene title='全部'>
<id>32fe0e59-c21e-43a1-9b27-8c66a35303a8</id>
<id>639ad787-1aa3-472a-9d6c-a9f64b8353a4</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>a71a929f-a200-41ae-adb6-9c211eed93c1</id>
<id>1cc591d3-2bb5-4b49-b21e-f58cbba7c9a0</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
......@@ -31,6 +31,27 @@
</ref>
<description/>
</field>
<field title='违规类型'>
<name>violationType.id</name>
<type>uuid</type>
<ref>
<type>一般引用</type>
<name>com.xyst.dinas.safe.datamodel.ViolationType</name>
</ref>
<description></description>
</field>
<field title='违规类型名称'>
<name>violationType.typeName</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.safe.datamodel.ViolationType</name>
</ref>
<description></description>
</field>
<field title='违规人员id'>
<name>staff.id</name>
<type>uuid</type>
......
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/query/TrainingEducation.mk
......@@ -9,16 +9,16 @@
<description>安全教育培训记录</description>
</header>
<content>
<customQuery id='9decdc8b-9fd7-49e5-ab8d-1ef1baacd050'>
<customQuery id='e7677aca-271a-486f-962a-312237940f93'>
<kclass>com.xyst.dinas.safe.datamodel.TrainingEducation</kclass>
<innerScene title='全部'>
<id>b398b85f-9ec7-484f-894b-931171c7070b</id>
<id>2a99b992-19f3-41a3-812c-ee2ef48bc0d7</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>8af570d5-9f12-43ca-8a60-05e37253f7db</id>
<id>bca2816a-114f-4920-9779-97696798b0dc</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
......@@ -164,4 +164,4 @@
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
</model>
backend/xyst.dinas.safe/src/main/model/com/xyst/dinas/safe/query/VehicleViolation.mk
......@@ -8,16 +8,16 @@
<description>人员违规记录</description>
</header>
<content>
<customQuery id='2576e6ca-14bc-4e3f-a8c6-7c1814cb10da'>
<customQuery id='02246467-fa26-4f1a-9369-0785b24f9097'>
<kclass>com.xyst.dinas.safe.datamodel.VehicleViolation</kclass>
<innerScene title='全部'>
<id>f9b0b0f8-b408-4f11-81dc-bd292413c1db</id>
<id>0e4ebc6f-b57c-482b-b847-31d9eca9fe81</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>4907fd02-d905-4295-b5f2-b0d80a0a6e35</id>
<id>1015974d-f56b-434d-939a-d233f9cd7cc1</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
......@@ -173,4 +173,4 @@
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
</model>
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>7749587d-c9b6-4450-8544-546f75ad71fc</id>
<id>6006c542-f1c2-4ce3-b34f-f7d01e43ba9d</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation$sequence</name>
<title>人员违规记录$sequence</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$serial.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>fd6880a4-8dbe-43f7-b64b-891698d9973d</id>
<id>fccd5bc1-640e-4ac8-90c4-86f1115e3537</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation$serial</name>
<title>人员违规记录$serial</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>c665e98a-73ab-409c-baff-b80da6af6a3e</id>
<id>bb3f038a-430f-4df3-9e41-76c65de6436c</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>1b87e55b-bd8b-4183-9ba7-65f0186346ea</id>
<id>093bef4b-cd74-4245-8784-0b052c4d9c45</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation$sequence</name>
<title>生产违规记录$sequence</title>
<description>生产违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$serial.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>e9a5669f-bbc4-4309-916e-b66e0076e685</id>
<id>ac71bc8c-718c-4eab-b5f8-1689b6af9221</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation$serial</name>
<title>生产违规记录$serial</title>
<description>生产违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>6db4834e-53e7-40b9-9112-670d1d44532c</id>
<id>bb436d8d-4abf-42f5-965e-3602bff0b94a</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation</name>
<title>生产违规记录</title>
<description>生产违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>7a3bfd62-2cfe-49f0-81b4-c9fe92bc9536</id>
<id>868868d7-1901-470b-b19b-ee15c201e38a</id>
<name>com.xyst.dinas.safe.bill.SafeLog$sequence</name>
<title>安全日志$sequence</title>
<description>安全日志</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$serial.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>50822486-0f67-4d67-aa74-661be23669f6</id>
<id>55df8170-6326-4409-ad86-f0cd7060e838</id>
<name>com.xyst.dinas.safe.bill.SafeLog$serial</name>
<title>安全日志$serial</title>
<description>安全日志</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>ce7bf6e0-e83d-4d59-8790-d65671fcff65</id>
<id>2cf9332a-3bc7-4a06-9b34-5c954cee6629</id>
<name>com.xyst.dinas.safe.bill.SafeLog</name>
<title>安全日志</title>
<description>安全日志</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>99554231-e793-4306-82ee-9ccfe2a43ebe</id>
<id>1c1b994c-9bd8-4fdf-86a8-091ac37b8987</id>
<name>com.xyst.dinas.safe.bill.ShipViolation$sequence</name>
<title>船舶违规记录$sequence</title>
<description>船舶违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$serial.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>b5f6f666-67f7-40b3-8ff0-dcfc5524bd7a</id>
<id>17606373-6b62-4b92-a2a2-c9b84a2772da</id>
<name>com.xyst.dinas.safe.bill.ShipViolation$serial</name>
<title>船舶违规记录$serial</title>
<description>船舶违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>75c942c5-e175-441a-86b2-f7f39afcccbe</id>
<id>f95ffb72-933c-4c6a-962c-b73f08057403</id>
<name>com.xyst.dinas.safe.bill.ShipViolation</name>
<title>船舶违规记录</title>
<description>船舶违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>db8b454f-d690-4bb1-b0b2-d3360e403a0a</id>
<id>72fdb131-b54a-44f0-a815-58f9195b456d</id>
<name>com.xyst.dinas.safe.bill.StaffViolation$sequence</name>
<title>人员违规记录$sequence</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$serial.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>b35bccc4-9071-418f-b116-d9a43bbd037f</id>
<id>4720393d-0c2a-41c1-8016-fed2748098ff</id>
<name>com.xyst.dinas.safe.bill.StaffViolation$serial</name>
<title>人员违规记录$serial</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>f54d87e5-0992-4fca-9cbe-744e9358aad0</id>
<id>05f7dd7c-90c5-41b3-b241-841e939967dc</id>
<name>com.xyst.dinas.safe.bill.StaffViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>c288b49e-3874-4ec7-b4da-b04acf8902d9</id>
<id>b9395038-d97c-4cf1-ae77-c76b34f3dd25</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation$sequence</name>
<title>安全教育培训记录$sequence</title>
<description>安全教育培训记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$serial.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>4a541239-2a32-49a1-abc2-a42d51772800</id>
<id>99c2c617-5160-4ed2-b316-f9e864265538</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation$serial</name>
<title>安全教育培训记录$serial</title>
<description>安全教育培训记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>fc1417c4-7021-4be8-9ef1-4386f69b01d3</id>
<id>aaa0e73a-15da-44f2-a41b-8a2571f40341</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation</name>
<title>安全教育培训记录</title>
<description>安全教育培训记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>31232184-e7ec-4ead-b325-01f927f78efa</id>
<id>1959576c-4b6d-4867-a13c-cdd89039de44</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation$sequence</name>
<title>车辆违规记录$sequence</title>
<description>车辆违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation$serial.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>7fdf1dd8-937a-4189-a806-6de1d2e2a6c8</id>
<id>adf75325-50f7-4bbd-abb5-7e1ff83d9c7a</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation$serial</name>
<title>车辆违规记录$serial</title>
<description>车辆违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>8769812d-fa4d-4dc6-aa1b-ee1411fc5976</id>
<id>945d1853-108a-4e92-a8e8-604a36f7f390</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation</name>
<title>车辆违规记录</title>
<description>车辆违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/PersonnelViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>672bc2a4-c62d-4eeb-96ec-490ff61814fd</id>
<id>4f447a16-066f-474c-856a-3b586f658de6</id>
<name>com.xyst.dinas.safe.datamodel.PersonnelViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......@@ -58,7 +58,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>371cddc8-f106-4159-9a97-c992f35e6180</m:id>
<m:id>f4732a79-d03f-482c-83f0-0e1d4d5d5a5e</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
......@@ -81,7 +81,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>4f749581-9014-4c7f-8218-5f877dfd15a7</m:id>
<m:id>b3a694c5-2b06-4b71-9406-81a6702a2bc9</m:id>
<m:name>personnelName</m:name>
<m:title>姓名</m:title>
<m:type>string</m:type>
......@@ -104,7 +104,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f953484b-6fdd-4306-8369-6f283ae3e820</m:id>
<m:id>2ebe7e41-9a93-4661-9a53-55101c766162</m:id>
<m:name>idCard</m:name>
<m:title>身份证</m:title>
<m:type>string</m:type>
......@@ -130,7 +130,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>623972c4-1882-475a-96cd-81e5e10d2aea</m:id>
<m:id>7bb37f32-c28c-4127-8835-2ecd68d1d662</m:id>
<m:name>createWarehouseUser</m:name>
<m:title>创建人(场站)</m:title>
<m:type>com.beecode.inz.basis.datamodel.WarehouseUser</m:type>
......@@ -156,7 +156,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>4a4bd684-11ff-432b-a339-46a4edf446ed</m:id>
<m:id>8c9a616c-0443-4418-b225-2bbeadcfed93</m:id>
<m:name>updateWarehouseUser</m:name>
<m:title>修改人(场站)</m:title>
<m:type>com.beecode.inz.basis.datamodel.WarehouseUser</m:type>
......@@ -179,7 +179,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>a5c7114a-ac23-4e38-a135-211812039e43</m:id>
<m:id>06194b2f-e7bc-4410-a900-e3879db9316f</m:id>
<m:name>stationId</m:name>
<m:title>场站,如果不是场站新增则添加0x000的值,方便前台查询</m:title>
<m:type>string</m:type>
......@@ -198,7 +198,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>37235ed3-18bd-46a6-a4c0-a4bcacb2b560</m:id>
<m:id>635ff66c-8bb2-4c63-9d84-ba462ef6d529</m:id>
<m:name>violationDate</m:name>
<m:title>违规时间</m:title>
<m:type>datetime</m:type>
......@@ -221,7 +221,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>e2570383-c83b-4cbe-8302-e704635177b7</m:id>
<m:id>cf60cb80-3297-48e5-ae0d-d432e5d8f3bb</m:id>
<m:name>violationDescription</m:name>
<m:title>违规描述</m:title>
<m:type>string</m:type>
......@@ -244,7 +244,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>6985f6e8-1717-4a43-b759-ae614c1425eb</m:id>
<m:id>313f8bf3-b248-400e-a3aa-6de658b80d82</m:id>
<m:name>processResult</m:name>
<m:title>违规处理结果</m:title>
<m:type>string</m:type>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/SafeLog.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>b666e7ea-9179-494c-9560-ffd2e5d13bdc</id>
<id>180a1971-e850-495d-b840-0836c8341a8e</id>
<name>com.xyst.dinas.safe.datamodel.SafeLog</name>
<title>安全日志</title>
<description>安全日志</description>
......@@ -60,7 +60,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>c5a7458f-f799-44ad-a0fb-9a66fc561f71</m:id>
<m:id>1073fd7d-24e9-48cd-8040-854c95be1ce8</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
......@@ -79,7 +79,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f905ccaa-5208-4293-8390-4ffbca81e415</m:id>
<m:id>cb9df5df-e87b-4ae7-ae71-687f57f432bd</m:id>
<m:name>checkDate</m:name>
<m:title>检查日期</m:title>
<m:type>datetime</m:type>
......@@ -102,7 +102,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>a7790986-6ca7-4fde-8dba-f1a813344513</m:id>
<m:id>1c3a4499-3fad-4fbe-9c32-a2a60dfdf6ad</m:id>
<m:name>checkDateWeather</m:name>
<m:title>检查日期天气</m:title>
<m:type>string</m:type>
......@@ -125,7 +125,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>222e8955-f3ff-405b-866a-ce5dcaf15fae</m:id>
<m:id>2836e06f-1a0e-466e-9731-25e64aa0e218</m:id>
<m:name>checkItem</m:name>
<m:title>检查项</m:title>
<m:type>string</m:type>
......@@ -148,7 +148,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>cdc87330-6245-4bc5-9e79-884153db9598</m:id>
<m:id>7270ee99-bd75-47cd-9c6e-11f6bfe5efaf</m:id>
<m:name>checkContent</m:name>
<m:title>检查内容</m:title>
<m:type>string</m:type>
......@@ -171,7 +171,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>3974755f-738b-45fe-bf99-9c98d9c321da</m:id>
<m:id>6fd413ae-6280-43c7-a435-51e21e0a90f3</m:id>
<m:name>checkArea</m:name>
<m:title>检查区域</m:title>
<m:type>string</m:type>
......@@ -194,7 +194,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>67794554-1e28-49bb-ae6e-78c476f0411a</m:id>
<m:id>deef28b4-1a2a-46b2-93b9-4adc05a62a4b</m:id>
<m:name>checkFindings</m:name>
<m:title>检查结论</m:title>
<m:type>string</m:type>
......@@ -220,7 +220,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>5c62a5c8-7528-4e01-959a-387fc9e8bad9</m:id>
<m:id>5f44e9aa-8b0e-4033-bf21-45cac834b372</m:id>
<m:name>approver</m:name>
<m:title>审批人</m:title>
<m:type>com.beecode.bap.staff.datamodel.Staff</m:type>
......@@ -243,7 +243,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>0d7b64de-a310-4921-ab85-51aa8143b03b</m:id>
<m:id>178ad5b5-5620-4a7b-b8a5-7c7ee8f7ebd4</m:id>
<m:name>failureReason</m:name>
<m:title>不通过原因</m:title>
<m:type>string</m:type>
......@@ -262,7 +262,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>834895d1-79af-4e32-a9ac-46d6214a6225</m:id>
<m:id>cd30783c-2169-40ad-b3e8-016e31ec006e</m:id>
<m:name>applyStatus</m:name>
<m:title>审批状态</m:title>
<m:type>int</m:type>
......@@ -281,7 +281,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>c301672b-f197-4199-b76b-5e5daf84d9fb</m:id>
<m:id>610dcf4d-0038-49e8-aba0-0d3550efdd6f</m:id>
<m:name>approvalTime</m:name>
<m:title>审批时间</m:title>
<m:type>datetime</m:type>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/SafeLogAssociatedStaffDetail.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>bd6a414f-db6b-4305-ad5d-c46dc2470690</id>
<id>9469e4dd-a550-4967-a50e-b59d24ed7084</id>
<name>com.xyst.dinas.safe.datamodel.SafeLogAssociatedStaffDetail</name>
<title>检查人员明细表</title>
<define>bcp.type.Class</define>
......@@ -55,7 +55,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>7f136def-a94d-469b-8b43-9e973976c9f7</m:id>
<m:id>b303e1b4-923d-4993-8108-8c8a85890fb6</m:id>
<m:name>staff</m:name>
<m:title>检查人员</m:title>
<m:type>com.beecode.bap.staff.datamodel.Staff</m:type>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/ShipViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>168e525f-2493-4296-98f0-e4d3e783065b</id>
<id>ea34a649-c731-47d2-9ebd-fec6b7fb093f</id>
<name>com.xyst.dinas.safe.datamodel.ShipViolation</name>
<title>船舶违规记录</title>
<description>船舶违规记录</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.safe.datamodel.ViolationType</dependency>
<dependency>javax.persistence.Entity</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>javax.persistence.Column</dependency>
......@@ -58,7 +59,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f9581920-58e1-46af-a443-65c79f7be5d5</m:id>
<m:id>76ac85b2-56ea-4eab-add8-8feb76f29a7a</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
......@@ -84,7 +85,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f3133aa9-18f5-494b-946c-c1f8f6db19ba</m:id>
<m:id>c11f8431-d101-4a27-acd4-1c55d4f171b4</m:id>
<m:name>shipInfo</m:name>
<m:title>所属船只</m:title>
<m:type>com.xyst.dinas.biz.datamodel.ShipInfo</m:type>
......@@ -94,6 +95,32 @@
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>violation_type_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f92c0047-fb07-4f5f-9685-0d509e1c65dc</m:id>
<m:name>violationType</m:name>
<m:title>违规类型Id</m:title>
<m:type>com.xyst.dinas.safe.datamodel.ViolationType</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
......@@ -103,7 +130,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>16d4471d-d98b-431d-8a11-a537ea951cf6</m:id>
<m:id>d9b68448-3d10-41d0-8190-384a3e2a1e93</m:id>
<m:name>violationDate</m:name>
<m:title>违规时间</m:title>
<m:type>datetime</m:type>
......@@ -126,7 +153,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>2cfada0b-70fe-47f1-a74e-1a4ec6f172cc</m:id>
<m:id>abdd8097-9dd8-4efa-8554-262299d857c5</m:id>
<m:name>violationDescription</m:name>
<m:title>违规描述</m:title>
<m:type>string</m:type>
......@@ -149,7 +176,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>af42626d-bc6c-4429-874b-c5dcf1103009</m:id>
<m:id>8e28b22d-9635-4aca-a7d8-b777c92beb2f</m:id>
<m:name>processResult</m:name>
<m:title>违规处理结果</m:title>
<m:type>string</m:type>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/StaffViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>9da68f6a-ba95-474a-81be-369d60cfa34b</id>
<id>a2a1fc32-4724-4cb8-a21d-f8f6ea77c9a0</id>
<name>com.xyst.dinas.safe.datamodel.StaffViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.safe.datamodel.ViolationType</dependency>
<dependency>javax.persistence.Entity</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>javax.persistence.Column</dependency>
......@@ -58,7 +59,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>49da9926-eb71-4f27-9aa2-033a6d176175</m:id>
<m:id>c97217c9-c9de-4c17-9ffe-2aede3c0067d</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
......@@ -84,7 +85,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>4cfa6f24-658b-43fc-82b0-de120c172d7c</m:id>
<m:id>65293682-c44c-4d78-b15d-5573011eecbb</m:id>
<m:name>staff</m:name>
<m:title>违规人</m:title>
<m:type>com.beecode.bap.staff.datamodel.Staff</m:type>
......@@ -94,6 +95,32 @@
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>violation_type_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>59d1941e-ccec-431c-8475-3bf10c4cba91</m:id>
<m:name>violationType</m:name>
<m:title>违规类型Id</m:title>
<m:type>com.xyst.dinas.safe.datamodel.ViolationType</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
......@@ -103,7 +130,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>6ca43015-8960-4576-b85e-2480381bf042</m:id>
<m:id>10d1e58f-8ec5-4d4b-8870-8c798e84679a</m:id>
<m:name>violationDate</m:name>
<m:title>违规时间</m:title>
<m:type>datetime</m:type>
......@@ -126,7 +153,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f8e78059-8e53-4110-86ad-f27c4dce72c3</m:id>
<m:id>abe2ecf9-1be8-43f1-9b3b-4d8cc6b4b7dc</m:id>
<m:name>violationDescription</m:name>
<m:title>违规描述</m:title>
<m:type>string</m:type>
......@@ -149,7 +176,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>bf181e8d-52fa-495d-b08b-e65cea56a679</m:id>
<m:id>f3203bc6-ceac-4a43-bc7b-6db0b5246931</m:id>
<m:name>processResult</m:name>
<m:title>违规处理结果</m:title>
<m:type>string</m:type>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/TrainingEducation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>75738fec-3b4a-4279-9f30-cbddccd7f785</id>
<id>779d39c1-b046-47d5-a43c-d7b6b26a4de8</id>
<name>com.xyst.dinas.safe.datamodel.TrainingEducation</name>
<title>培训教育记录</title>
<description>培训教育记录</description>
......@@ -57,7 +57,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>715a6cb7-4ae2-485d-8c70-0b8702b3afe5</m:id>
<m:id>0fc2ea1d-cfa9-4b70-a8f6-e1c617d5eeb7</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
......@@ -76,7 +76,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>8464c1ff-9cc1-471d-9a63-50cb4f748910</m:id>
<m:id>974b1330-0b44-4ea9-9d12-bea8c75fe8e1</m:id>
<m:name>educationDate</m:name>
<m:title>培训日期</m:title>
<m:type>datetime</m:type>
......@@ -99,7 +99,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>6fb592f5-89b0-435a-b905-0619011580e5</m:id>
<m:id>08c4ecf4-32f8-4f53-afbc-d74f6de13434</m:id>
<m:name>trainingEducationName</m:name>
<m:title>培训会议名称</m:title>
<m:type>string</m:type>
......@@ -118,7 +118,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>a5288451-8649-4139-816d-8a043c24a1c4</m:id>
<m:id>6b788606-d4c9-4dbd-b149-744af7425394</m:id>
<m:name>participantsCount</m:name>
<m:title>参会人数</m:title>
<m:type>int</m:type>
......@@ -141,7 +141,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>7a1e588c-286e-4dfc-bb4f-fca5a45f39ae</m:id>
<m:id>4fea3296-5297-4b77-a69c-f0a435100f5f</m:id>
<m:name>meetingPlace</m:name>
<m:title>会议地点</m:title>
<m:type>string</m:type>
......@@ -164,7 +164,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>35024ffb-3002-43c4-8a69-4c6bdb194e34</m:id>
<m:id>09a1331c-e981-458a-9c7a-d33fceeab264</m:id>
<m:name>participants</m:name>
<m:title>参会人员</m:title>
<m:type>string</m:type>
......@@ -187,7 +187,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>eece008b-e265-4c70-b24c-75d167c58e92</m:id>
<m:id>7d9597ee-0588-4efe-ae62-f7fc85a7db2a</m:id>
<m:name>meetingContent</m:name>
<m:title>会议内容</m:title>
<m:type>string</m:type>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/VehicleViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>9ba68f6a-ba95-474a-81be-369d60cfa34b</id>
<id>e0f00726-428a-4747-b3c1-15b70554667a</id>
<name>com.xyst.dinas.safe.datamodel.VehicleViolation</name>
<title>车辆违规记录</title>
<description>车辆违规记录</description>
......@@ -58,7 +58,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>49da9926-eb71-4f27-9aa2-033a6d176175</m:id>
<m:id>47c74996-f3e5-4c70-ab29-6bc0612ab479</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
......@@ -84,7 +84,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>49da9926-eb71-4f27-9aa2-033a6d176175</m:id>
<m:id>2a72b9a4-54fc-4484-86f2-2e2ddc904e70</m:id>
<m:name>createWarehouseUser</m:name>
<m:title>创建人(场站)</m:title>
<m:type>com.beecode.inz.basis.datamodel.WarehouseUser</m:type>
......@@ -110,7 +110,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>49da9926-eb71-4f27-9aa2-033a6d176175</m:id>
<m:id>fb20f9fb-81b1-4a12-8b1e-f41ca6e80828</m:id>
<m:name>updateWarehouseUser</m:name>
<m:title>修改人(场站)</m:title>
<m:type>com.beecode.inz.basis.datamodel.WarehouseUser</m:type>
......@@ -133,7 +133,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>6ca43015-8960-4576-b85e-2480381bf042</m:id>
<m:id>85bd66e5-7674-4bcc-9618-cbb79b0082ed</m:id>
<m:name>plateNumber</m:name>
<m:title>车牌号</m:title>
<m:type>string</m:type>
......@@ -156,7 +156,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>6ca43015-8960-4576-b85e-2480381bf042</m:id>
<m:id>f6c422a5-6ebd-4bcc-8d10-ccdd91a474c3</m:id>
<m:name>stationId</m:name>
<m:title>场站,如果不是场站新增则添加0x000的值,方便前台查询</m:title>
<m:type>string</m:type>
......@@ -175,7 +175,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>6ca43015-8960-4576-b85e-2480381bf042</m:id>
<m:id>0189bced-6a4c-4a89-879e-f05e60fbcc63</m:id>
<m:name>violationDate</m:name>
<m:title>违规时间</m:title>
<m:type>datetime</m:type>
......@@ -198,7 +198,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f8e78059-8e53-4110-86ad-f27c4dce72c3</m:id>
<m:id>9727044d-8550-4867-9b9f-9443361e8c1c</m:id>
<m:name>violationDescription</m:name>
<m:title>违规描述</m:title>
<m:type>string</m:type>
......@@ -221,7 +221,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>bf181e8d-52fa-495d-b08b-e65cea56a679</m:id>
<m:id>bc6d7baa-39df-418c-9640-82b7272e1ed5</m:id>
<m:name>processResult</m:name>
<m:title>违规处理结果</m:title>
<m:type>string</m:type>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/ViolationType.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>fc3075e5-8374-489b-855f-69177f6add0d</id>
<name>com.xyst.dinas.safe.datamodel.ViolationType</name>
<title>违规类型表</title>
<description>违规类型表</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>javax.persistence.Entity</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.beecode.bcp.dict.datamodel.BasicDictRequirement</dependency>
<dependency>javax.persistence.JoinColumn</dependency>
<dependency>javax.persistence.OneToMany</dependency>
<content>
<m:class>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Entity</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Table</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>xyst_dinas_safe_violation_type</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:parents>
<m:parent>com.beecode.bcp.dict.datamodel.BasicDictRequirement</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>100</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>type_name</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>976364fb-62bc-4f73-84a4-13c6588b1c46</m:id>
<m:name>typeName</m:name>
<m:title>类型名称</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>belong_violation</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>dd222858-5ede-4657-9d4d-2dec1f4e58db</m:id>
<m:name>belongViolation</m:name>
<m:title>所属哪个违规记录</m:title>
<m:type>int</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/dict/ViolationTypeDict$listSelector.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-selector">
<specification>1.0</specification>
<id>a55b6f2e-a48c-4d85-bec9-9ea8d88d5471</id>
<name>com.xyst.dinas.safe.datamodel.dict.ViolationTypeDict$listSelector</name>
<title>listSelector</title>
<define>bcp.selector.ListSelector</define>
<define-version>1.0</define-version>
<content>
<m:list-selector>
<m:columns>
<m:column>
<m:name>typeName</m:name>
<m:title>类型名称</m:title>
<m:type>string</m:type>
<m:output>false</m:output>
</m:column>
<m:column>
<m:name>belongViolation</m:name>
<m:title>所属哪个违规记录</m:title>
<m:type>int</m:type>
<m:output>false</m:output>
</m:column>
<m:column>
<m:name>name</m:name>
<m:title>名称</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
<m:column>
<m:name>title</m:name>
<m:title>标题</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
<m:column>
<m:name>shortName</m:name>
<m:title>助记码</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
<m:column>
<m:name>memo</m:name>
<m:title>备注</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
<m:column>
<m:name>pathCode</m:name>
<m:title>路径编码</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
<m:column>
<m:name>path</m:name>
<m:title>路径</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
</m:columns>
<m:adapter>
<m:name>com.beecode.bap.biztrait.BasicBillDictListSelectorAdaptor</m:name>
</m:adapter>
<m:config>com.xyst.dinas.safe.datamodel.dict.ViolationTypeDict</m:config>
</m:list-selector>
</content>
</metadata>
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/dict/ViolationTypeDict.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-dict">
<specification>1.0</specification>
<id>cfacc653-5ef8-4ff4-81fc-b1674e1610aa</id>
<name>com.xyst.dinas.safe.datamodel.dict.ViolationTypeDict</name>
<title>文件共享设置</title>
<define>bcp.dict</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.safe.datamodel.ViolationType</dependency>
<content>
<m:dict>
<m:type>com.xyst.dinas.safe.datamodel.ViolationType</m:type>
<m:config>
<m:structure>list</m:structure>
<m:code-rule></m:code-rule>
</m:config>
</m:dict>
</content>
</metadata>
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/query/PersonnelViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>21cfaaa4-78bc-4384-9431-cd59341ad2dd</id>
<id>7d0a582f-9bec-4e2a-904c-62a9f0298a78</id>
<name>com.xyst.dinas.safe.query.PersonnelViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......@@ -15,14 +15,14 @@
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>94d95a10-a9b2-4431-bade-bef26b0517d3</m:id>
<m:id>711ba77b-b5f2-4367-a12f-11c7f8048ff1</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>97a318b9-61a9-46d7-bf46-5df7ca57c694</m:id>
<m:id>285cb16d-9d01-4a7e-96cf-b5a0e0f29de3</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/query/ProductionLineViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>a53c5642-3d85-4fd9-a13a-512975e3dfc0</id>
<id>7d24edfe-a4a6-4602-855a-947ec6bfed51</id>
<name>com.xyst.dinas.safe.query.ProductionLineViolation</name>
<title>生产违规记录</title>
<description>生产违规记录</description>
......@@ -15,14 +15,14 @@
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>0c2eeafb-9939-4df9-a04b-2a839b255f74</m:id>
<m:id>4d3ad953-29ee-4b4c-9a2d-bac3aeed82a8</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>b440289a-6f56-4b5f-b401-fce17dd86176</m:id>
<m:id>d91897ad-b161-4a23-b1bc-bb0dde76d0b4</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
......@@ -51,19 +51,39 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.id</m:name>
<m:title></m:title>
<m:name>productionLine.name</m:name>
<m:title>生产线名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.ProductionLine</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>violationType.id</m:name>
<m:title>违规类型</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:name>com.xyst.dinas.safe.datamodel.ViolationType</m:name>
<m:type>一般引用</m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>violationType.typeName</m:name>
<m:title>违规类型名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.safe.datamodel.ViolationType</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.name</m:name>
<m:name>regionalCompany.id</m:name>
<m:title></m:title>
<m:type>string</m:type>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
......@@ -71,11 +91,11 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>productionLine.name</m:name>
<m:title>生产线名称</m:title>
<m:name>regionalCompany.name</m:name>
<m:title></m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.ProductionLine</m:name>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/query/SafeLog.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>2cb5cdcc-d8ee-44f3-8cd2-11c2f62bff0a</id>
<id>c1751da0-4126-48ed-bfe4-27aa117cb666</id>
<name>com.xyst.dinas.safe.query.SafeLog</name>
<title>安全日志</title>
<description>安全日志</description>
......@@ -15,14 +15,14 @@
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>01c6cee9-ce47-4c46-9ece-f57ea66bc601</m:id>
<m:id>31e1bcb5-a64b-4ef7-afb8-22dc3f127377</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>34921972-7319-482c-b97a-ae13172ce68f</m:id>
<m:id>1f2fb4a8-943d-4f73-915b-88254e40890a</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/query/ShipViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>0591cfad-73f1-4c79-982d-ab584f0600a9</id>
<id>622797ac-4e14-4850-bad2-e396d17c1086</id>
<name>com.xyst.dinas.safe.query.ShipViolation</name>
<title>船舶违规记录</title>
<description>船舶违规记录</description>
......@@ -15,14 +15,14 @@
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>32fe0e59-c21e-43a1-9b27-8c66a35303a8</m:id>
<m:id>8ebf0175-4f70-4ec2-b909-5c40a5b87fe1</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>a71a929f-a200-41ae-adb6-9c211eed93c1</m:id>
<m:id>7e72c8f9-12af-4960-93a5-cae1fbf05c48</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
......@@ -51,6 +51,26 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>violationType.id</m:name>
<m:title>违规类型</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.safe.datamodel.ViolationType</m:name>
<m:type>一般引用</m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>violationType.typeName</m:name>
<m:title>违规类型名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.safe.datamodel.ViolationType</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>id</m:name>
<m:title>id</m:title>
<m:type>uuid</m:type>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/query/StaffViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>df798a17-851b-41ac-80a7-80e999b0d03d</id>
<id>66c38443-00f6-4147-a1a6-32b6855e7745</id>
<name>com.xyst.dinas.safe.query.StaffViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......@@ -15,14 +15,14 @@
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>32fe0e59-c21e-43a1-9b27-8c66a35303a8</m:id>
<m:id>639ad787-1aa3-472a-9d6c-a9f64b8353a4</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>a71a929f-a200-41ae-adb6-9c211eed93c1</m:id>
<m:id>1cc591d3-2bb5-4b49-b21e-f58cbba7c9a0</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
......@@ -41,6 +41,26 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>violationType.id</m:name>
<m:title>违规类型</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.safe.datamodel.ViolationType</m:name>
<m:type>一般引用</m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>violationType.typeName</m:name>
<m:title>违规类型名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.safe.datamodel.ViolationType</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>staff.id</m:name>
<m:title>违规人员id</m:title>
<m:type>uuid</m:type>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/query/TrainingEducation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>9decdc8b-9fd7-49e5-ab8d-1ef1baacd050</id>
<id>e7677aca-271a-486f-962a-312237940f93</id>
<name>com.xyst.dinas.safe.query.TrainingEducation</name>
<title>安全教育培训记录</title>
<description>安全教育培训记录</description>
......@@ -15,14 +15,14 @@
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>b398b85f-9ec7-484f-894b-931171c7070b</m:id>
<m:id>2a99b992-19f3-41a3-812c-ee2ef48bc0d7</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>8af570d5-9f12-43ca-8a60-05e37253f7db</m:id>
<m:id>bca2816a-114f-4920-9779-97696798b0dc</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/query/VehicleViolation.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>2576e6ca-14bc-4e3f-a8c6-7c1814cb10da</id>
<id>02246467-fa26-4f1a-9369-0785b24f9097</id>
<name>com.xyst.dinas.safe.query.VehicleViolation</name>
<title>车辆违规记录</title>
<description>人员违规记录</description>
......@@ -15,14 +15,14 @@
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>f9b0b0f8-b408-4f11-81dc-bd292413c1db</m:id>
<m:id>0e4ebc6f-b57c-482b-b847-31d9eca9fe81</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>4907fd02-d905-4295-b5f2-b0d80a0a6e35</m:id>
<m:id>1015974d-f56b-434d-939a-d233f9cd7cc1</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
......
backend/xyst.dinas.safe/src/main/resources/config/ProductionLineViolation.hbm.xml
......@@ -45,6 +45,12 @@
<comment>所属组织机构</comment>
</column>
</many-to-one>
<many-to-one name="violationType" entity-name="com.xyst.dinas.safe.datamodel.ViolationType" fetch="select">
<column name="violation_type_id" not-null="false">
<comment>所属违规类型id</comment>
</column>
</many-to-one>
<property name="violationDate" type="timestamp" not-null="true">
<column name="violation_date">
<comment>违规时间</comment>
......
backend/xyst.dinas.safe/src/main/resources/config/ShipViolation.hbm.xml
......@@ -45,6 +45,11 @@
<comment>所属组织机构</comment>
</column>
</many-to-one>
<many-to-one name="violationType" entity-name="com.xyst.dinas.safe.datamodel.ViolationType" fetch="select">
<column name="violation_type_id" not-null="false">
<comment>所属违规类型id</comment>
</column>
</many-to-one>
<property name="violationDate" type="timestamp" not-null="true">
<column name="violation_date">
<comment>违规时间</comment>
......
backend/xyst.dinas.safe/src/main/resources/config/StaffViolation.hbm.xml
......@@ -45,6 +45,12 @@
<comment>所属组织机构</comment>
</column>
</many-to-one>
<many-to-one name="violationType" entity-name="com.xyst.dinas.safe.datamodel.ViolationType" fetch="select">
<column name="violation_type_id" not-null="false">
<comment>所属违规类型id</comment>
</column>
</many-to-one>
<property name="violationDate" type="timestamp" not-null="true">
<column name="violation_date">
<comment>违规时间</comment>
......
backend/xyst.dinas.safe/src/main/resources/config/ViolationType.hbm.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
<union-subclass entity-name="com.xyst.dinas.safe.datamodel.ViolationType" table="xyst_dinas_safe_violation_type" extends = "com.beecode.bcp.dict.datamodel.BasicDictRequirement">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<property name="typeName" type="nstring" not-null="false">
<column name="type_name" length="100">
<comment>类型名称</comment>
</column>
</property>
<property name="belongViolation" type="int" not-null="false">
<column name="belong_violation" length="100">
<comment>所属哪个违规记录 0船舶违规 1生产违规 2人员违规</comment>
</column>
</property>
</union-subclass>
</hibernate-mapping>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment