Commit 1810c1fb by 徐澳

Merge remote-tracking branch 'origin/dev' into dev

parents 1d396ed0 d9a7bc73
......@@ -11,11 +11,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.baosight</groupId>
<artifactId>hp_smart</artifactId>
<artifactId>hpjx</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>hp_smart</name>
<name>hpjx</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......@@ -207,7 +207,7 @@
<version>2.4</version>
<configuration>
<excludes>
<exclude>**/Iplat4jApplication.class</exclude>
<exclude>**/HpjxApplication.class</exclude>
<exclude>**/application.properties</exclude>
<exclude>**/quartz.properties</exclude>
<exclude>**/log4j2.xml</exclude>
......
package com.baosight.iplat4j;
package com.baosight.hpjx;
import com.baosight.iplat4j.config.ApplicationProperties;
import org.springframework.boot.SpringApplication;
......@@ -14,16 +14,16 @@ import org.springframework.context.annotation.ImportResource;
@ServletComponentScan("com.baosight.iplat4j.core.web.servlet")
@ImportResource(locations = {"classpath*:spring/framework/platApplicationContext*.xml","classpath*:spring/framework/applicationContext*.xml"})
@EnableConfigurationProperties({LiquibaseProperties.class, ApplicationProperties.class})
public class Iplat4jApplication extends SpringBootServletInitializer {
public class HpjxApplication extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication app = new SpringApplication(Iplat4jApplication.class);
SpringApplication app = new SpringApplication(HpjxApplication.class);
app.run(args);
}
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(Iplat4jApplication.class);
return application.sources(HpjxApplication.class);
}
}
package com.baosight.iplat4j.common;
package com.baosight.hpjx.common;
import com.baosight.iplat4j.core.ei.EiBlock;
......
package com.baosight.iplat4j.common;
package com.baosight.hpjx.common;
import com.baosight.iplat4j.core.ei.EiBlock;
......
package com.baosight.iplat4j.common;
package com.baosight.hpjx.common;
/**
* @Author wwl
......
package com.baosight.iplat4j.common;
package com.baosight.hpjx.common;
/**
* @author xuao
......
package com.baosight.iplat4j.common;
package com.baosight.hpjx.common;
import com.baosight.iplat4j.core.ei.EiBlock;
......
package com.baosight.iplat4j.demo;
package com.baosight.hpjx.demo;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
......
......@@ -2,7 +2,7 @@
* Generate time : 2024-01-08 18:33:20
* Version : 1.0
*/
package com.baosight.iplat4j.demo.domain;
package com.baosight.hpjx.demo.domain;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase;
import java.util.HashMap;
......
package com.baosight.iplat4j.demo.service;
package com.baosight.hpjx.demo.service;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.demo.domain.Tveci002;
import com.baosight.hpjx.demo.domain.Tveci002;
import java.util.Map;
......
package com.baosight.hpjx.hp.kc.service;
\ No newline at end of file
package com.baosight.hpjx.hp.kc.sql;
\ No newline at end of file
......@@ -2,7 +2,7 @@
* Generate time : 2024-01-09 10:44:10
* Version : 1.0
*/
package com.baosight.iplat4j.hp.pz.domain;
package com.baosight.hpjx.hp.pz.domain;
import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.ei.EiColumn;
......
......@@ -2,7 +2,7 @@
* Generate time : 2024-01-09 15:56:49
* Version : 1.0
*/
package com.baosight.iplat4j.hp.pz.domain;
package com.baosight.hpjx.hp.pz.domain;
import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.util.DateUtils;
import java.sql.Timestamp;
......
......@@ -2,7 +2,7 @@
* Generate time : 2024-01-10 10:28:33
* Version : 1.0
*/
package com.baosight.iplat4j.hp.pz.domain;
package com.baosight.hpjx.hp.pz.domain;
import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase;
......
......@@ -2,7 +2,7 @@
* Generate time : 2024-01-09 17:46:33
* Version : 1.0
*/
package com.baosight.iplat4j.hp.pz.domain;
package com.baosight.hpjx.hp.pz.domain;
import com.baosight.iplat4j.core.util.NumberUtils;
......
......@@ -2,7 +2,7 @@
* Generate time : 2024-01-10 14:11:21
* Version : 1.0
*/
package com.baosight.iplat4j.hp.pz.domain;
package com.baosight.hpjx.hp.pz.domain;
import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase;
......
......@@ -2,7 +2,7 @@
* Generate time : 2024-01-09 10:04:30
* Version : 1.0
*/
package com.baosight.iplat4j.hp.pz.domain;
package com.baosight.hpjx.hp.pz.domain;
import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.ei.EiColumn;
......
package com.baosight.iplat4j.hp.pz.service;
package com.baosight.hpjx.hp.pz.service;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
......@@ -6,7 +6,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.core.web.threadlocal.UserSession;
import com.baosight.iplat4j.hp.pz.domain.Thppz001;
import com.baosight.hpjx.hp.pz.domain.Thppz001;
import java.text.SimpleDateFormat;
import java.util.Date;
......
package com.baosight.iplat4j.hp.pz.service;
package com.baosight.hpjx.hp.pz.service;
import com.baosight.iplat4j.common.CompanyTypeEnum;
import com.baosight.iplat4j.util.CommonMethod;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.hp.pz.domain.THppz002;
import com.baosight.hpjx.hp.pz.domain.THppz002;
import java.util.Map;
......
package com.baosight.iplat4j.hp.pz.service;
package com.baosight.hpjx.hp.pz.service;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
......@@ -6,7 +6,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.core.web.threadlocal.UserSession;
import com.baosight.iplat4j.hp.pz.domain.THppz003;
import com.baosight.hpjx.hp.pz.domain.THppz003;
import java.text.SimpleDateFormat;
import java.util.Date;
......
package com.baosight.iplat4j.hp.pz.service;
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.hp.pz.domain.THppz004;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.hp.pz.domain.THppz004;
import com.baosight.iplat4j.util.CommonMethod;
import java.util.Map;
......
package com.baosight.iplat4j.hp.pz.service;
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.hp.pz.domain.HPPZ005;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.core.web.threadlocal.UserSession;
import com.baosight.iplat4j.hp.pz.domain.HPPZ005;
import com.baosight.iplat4j.hp.pz.domain.HPPZ005;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
......
package com.baosight.iplat4j.hp.pz.service;
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.hp.pz.domain.HPPZ007;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.core.web.threadlocal.UserSession;
import com.baosight.iplat4j.hp.pz.domain.HPPZ007;
import com.baosight.iplat4j.hp.pz.domain.HPPZ007;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
......
......@@ -4,7 +4,7 @@
<sqlMap namespace="HPPZ001">
<select id="query" parameterClass="java.util.HashMap"
resultClass="com.baosight.iplat4j.hp.pz.domain.Thppz001">
resultClass="com.baosight.hpjx.hp.pz.domain.Thppz001">
SELECT
ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
......
......@@ -19,7 +19,7 @@
<sqlMap namespace="HPPZ002">
<select id="query" parameterClass="java.util.HashMap"
resultClass="com.baosight.iplat4j.hp.pz.domain.THppz002">
resultClass="com.baosight.hpjx.hp.pz.domain.THppz002">
SELECT
ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
......
......@@ -19,7 +19,7 @@
<sqlMap namespace="HPPZ003">
<select id="query" parameterClass="java.util.HashMap"
resultClass="com.baosight.iplat4j.hp.pz.domain.THppz003">
resultClass="com.baosight.hpjx.hp.pz.domain.THppz003">
SELECT
ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
......
......@@ -19,7 +19,7 @@
<sqlMap namespace="HPPZ004">
<select id="query" parameterClass="java.util.HashMap"
resultClass="com.baosight.iplat4j.hp.pz.domain.THppz004">
resultClass="com.baosight.hpjx.hp.pz.domain.THppz004">
SELECT
ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
......
......@@ -17,7 +17,7 @@
<sqlMap namespace="HPPZ005">
<select id="query" parameterClass="java.util.HashMap"
resultClass="com.baosight.iplat4j.hp.pz.domain.HPPZ005">
resultClass="com.baosight.hpjx.hp.pz.domain.HPPZ005">
SELECT
ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
......
......@@ -19,7 +19,7 @@
<sqlMap namespace="HPPZ007">
<select id="query" parameterClass="java.util.HashMap"
resultClass="com.baosight.iplat4j.hp.pz.domain.HPPZ007">
resultClass="com.baosight.hpjx.hp.pz.domain.HPPZ007">
SELECT
ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
......
package com.baosight.hpjx.hp.sc.domain;
\ No newline at end of file
package com.baosight.hpjx.hp.sc.service;
\ No newline at end of file
package com.baosight.hpjx.hp.sc.sql;
\ No newline at end of file
package com.baosight.hpjx.hp.zl.domain;
\ No newline at end of file
package com.baosight.hpjx.hp.zl.service;
\ No newline at end of file
package com.baosight.hpjx.hp.zl.sql;
\ No newline at end of file
package com.baosight.iplat4j.util;
package com.baosight.hpjx.util;
import com.baosight.iplat4j.common.HPConstants;
import com.baosight.iplat4j.common.DdynamicEnum;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.HPConstants;
import com.baosight.iplat4j.core.data.DaoEPBase;
import com.baosight.iplat4j.core.data.ibatis.dao.Dao;
import com.baosight.iplat4j.core.ei.EiBlock;
......@@ -10,7 +10,6 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.ioc.spring.PlatApplicationContext;
import com.baosight.iplat4j.core.util.DateUtils;
import com.baosight.iplat4j.core.web.threadlocal.UserSession;
import org.apache.commons.lang.StringUtils;
import java.util.HashMap;
import java.util.List;
......
package com.baosight.iplat4j.hp.kc.service;
\ No newline at end of file
package com.baosight.iplat4j.hp.kc.sql;
\ No newline at end of file
package com.baosight.iplat4j.hp.sc.domain;
\ No newline at end of file
package com.baosight.iplat4j.hp.sc.service;
\ No newline at end of file
package com.baosight.iplat4j.hp.sc.sql;
\ No newline at end of file
package com.baosight.iplat4j.hp.zl.domain;
\ No newline at end of file
package com.baosight.iplat4j.hp.zl.service;
\ No newline at end of file
package com.baosight.iplat4j.hp.zl.sql;
\ No newline at end of file
......@@ -16,7 +16,7 @@ spring.servlet.multipart.file-size-threshold =0
#\u9879\u76EE\u540D\u79F0
projectName=iplat4j
projectName=hpjx
moduleName=ep
projectEnv=dev
platSchema=iplat
......
......@@ -2,16 +2,16 @@
<licenses>
<license code="iPlat4J-Smart">
<LicenseCode desc="产品代码" type="fixed">iPlat4J-Smart</LicenseCode>
<ExpiringDate desc="过期时间" type="fixed">2024-04-05</ExpiringDate>
<ExpiringDate desc="过期时间" type="fixed">2024-04-09</ExpiringDate>
<AuthorizingCompany desc="签发单位" type="fixed">上海宝信软件股份有限公司</AuthorizingCompany>
<AuthorizingSoftware desc="产品名称" type="fixed">iPlat4J-Smart</AuthorizingSoftware>
<AuthorizedClient desc="授权部门名称" type="fixed">武汉宝信大数据事业部</AuthorizedClient>
<AuthorizedEnterprise desc="授权企业名称" type="fixed">武汉宝信大数据事业部</AuthorizedEnterprise>
<AuthorizedProject desc="项目名称" type="fixed">iplat_smart</AuthorizedProject>
<AuthorizedProject desc="项目名称" type="fixed">hpjx</AuthorizedProject>
<AuthorizedOS desc="授权操作系统" type="fixed">Linux</AuthorizedOS>
<SigningDate desc="签发时间" type="fixed">20240105</SigningDate>
<StartDate desc="开始时间" type="fixed">2024-01-05</StartDate>
<LicenseID desc="许可证编号" type="fixed">LIC20240105iplat_smart</LicenseID>
<SigningDate desc="签发时间" type="fixed">20240109</SigningDate>
<StartDate desc="开始时间" type="fixed">2024-01-09</StartDate>
<LicenseID desc="许可证编号" type="fixed">LIC20240109hpjx</LicenseID>
<LicenseMode desc="许可证模式" type="fixed">CheckHost</LicenseMode>
<HostMAC desc="主机MAC地址" type="fixed"></HostMAC>
<PluginXdatashow desc="报屏" type="customized">1</PluginXdatashow>
......@@ -19,14 +19,17 @@
<PluginUi desc="Vue UI" type="customized">1</PluginUi>
<PluginDoc desc="文档" type="customized">1</PluginDoc>
<PluginOrg desc="组织机构" type="customized">1</PluginOrg>
<PluginRedis desc="Redis缓存" type="customized">1</PluginRedis>
<PluginMessage desc="电文通信" type="customized">1</PluginMessage>
<PluginDatas desc="数据管理" type="customized">1</PluginDatas>
<PluginLog desc="日志" type="customized">1</PluginLog>
<PluginProtal desc="门户" type="customized">1</PluginProtal>
<PluginWidgetEco desc="微件" type="customized">1</PluginWidgetEco>
<PluginMail desc="邮件" type="customized">1</PluginMail>
<PluginNetty desc="高性能通信通信" type="customized">1</PluginNetty>
<PluginLowcode desc="低代码" type="customized">1</PluginLowcode>
<signature desc="防伪签名" type="fixed">
302c02146dab42fa53a41d2c01f7adbc9b5429811ae4773302142aaa63b072abad1fd65898ecfe25a0007f7a69c7
302d02150091439af39970c82694fd53189dcefd17c28fffc90214153ada7ee0a4c26c4b752c4cc0b1e4986f49178e
</signature>
</license>
</licenses>
<?xml version="1.0" encoding="UTF-8"?>
<licenses>
<license code="iPlat4J-Smart">
<LicenseCode desc="产品代码" type="fixed">iPlat4J-Smart</LicenseCode>
<ExpiringDate desc="过期时间" type="fixed">2024-04-05</ExpiringDate>
<AuthorizingCompany desc="签发单位" type="fixed">上海宝信软件股份有限公司</AuthorizingCompany>
<AuthorizingSoftware desc="产品名称" type="fixed">iPlat4J-Smart</AuthorizingSoftware>
<AuthorizedClient desc="授权部门名称" type="fixed">武汉宝信大数据事业部</AuthorizedClient>
<AuthorizedEnterprise desc="授权企业名称" type="fixed">武汉宝信大数据事业部</AuthorizedEnterprise>
<AuthorizedProject desc="项目名称" type="fixed">iplat_smart</AuthorizedProject>
<AuthorizedOS desc="授权操作系统" type="fixed">Linux</AuthorizedOS>
<SigningDate desc="签发时间" type="fixed">20240105</SigningDate>
<StartDate desc="开始时间" type="fixed">2024-01-05</StartDate>
<LicenseID desc="许可证编号" type="fixed">LIC20240105iplat_smart</LicenseID>
<LicenseMode desc="许可证模式" type="fixed">CheckHost</LicenseMode>
<HostMAC desc="主机MAC地址" type="fixed"></HostMAC>
<PluginXdatashow desc="报屏" type="customized">1</PluginXdatashow>
<PluginReport desc="报表" type="customized">1</PluginReport>
<PluginUi desc="Vue UI" type="customized">1</PluginUi>
<PluginDoc desc="文档" type="customized">1</PluginDoc>
<PluginOrg desc="组织机构" type="customized">1</PluginOrg>
<PluginMessage desc="电文通信" type="customized">1</PluginMessage>
<PluginDatas desc="数据管理" type="customized">1</PluginDatas>
<PluginLog desc="日志" type="customized">1</PluginLog>
<PluginProtal desc="门户" type="customized">1</PluginProtal>
<PluginWidgetEco desc="微件" type="customized">1</PluginWidgetEco>
<PluginMail desc="邮件" type="customized">1</PluginMail>
<signature desc="防伪签名" type="fixed">
302c02146dab42fa53a41d2c01f7adbc9b5429811ae4773302142aaa63b072abad1fd65898ecfe25a0007f7a69c7
</signature>
</license>
</licenses>
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