Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
enterprise-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
enterprise-platform
Commits
f5a933de
Commit
f5a933de
authored
Dec 06, 2024
by
姬鋆屾
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.scsmile.cn/zxf/enterprise-platform
parents
c6d6a13a
9ef22e94
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
2791 additions
and
2547 deletions
+2791
-2547
db/add.sql
db/add.sql
+8
-1
enterprise-manager/pom.xml
enterprise-manager/pom.xml
+23
-17
enterprise-manager/src/main/bin/deploy.sh
enterprise-manager/src/main/bin/deploy.sh
+8
-4
enterprise-manager/src/main/bin/shutdown.sh
enterprise-manager/src/main/bin/shutdown.sh
+16
-15
enterprise-manager/src/main/bin/start.sh
enterprise-manager/src/main/bin/start.sh
+10
-8
enterprise-manager/src/main/java/com/mortals/xhx/busiz/controller/TestIdempotentController.java
...ortals/xhx/busiz/controller/TestIdempotentController.java
+3
-0
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyEntity.java
...a/com/mortals/xhx/module/company/model/CompanyEntity.java
+111
-106
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyQuery.java
...va/com/mortals/xhx/module/company/model/CompanyQuery.java
+1132
-1076
enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java
...s/xhx/module/company/service/impl/CompanyServiceImpl.java
+28
-0
enterprise-manager/src/main/java/com/mortals/xhx/module/company/web/CompanyController.java
...com/mortals/xhx/module/company/web/CompanyController.java
+10
-3
enterprise-manager/src/main/java/com/mortals/xhx/module/news/service/impl/NewsServiceImpl.java
...mortals/xhx/module/news/service/impl/NewsServiceImpl.java
+1
-1
enterprise-manager/src/main/resources/sqlmap/module/company/CompanyMapper.xml
...rc/main/resources/sqlmap/module/company/CompanyMapper.xml
+1439
-1315
enterprise-manager/src/test/java/com/mortals/httpclient/company/CompanyController.http
...ava/com/mortals/httpclient/company/CompanyController.http
+2
-1
No files found.
db/add.sql
View file @
f5a933de
-- ----------------------------
-- ----------------------------
2023
-
9
-
11
--
2023-9-11
-- ----------------------------
-- ----------------------------
ALTER
TABLE
mortals_xhx_user
ADD
COLUMN
`staffId`
varchar
(
64
)
COMMENT
'员工Id,关联用户员工表'
;
ALTER
TABLE
mortals_xhx_user
ADD
COLUMN
`staffId`
varchar
(
64
)
COMMENT
'员工Id,关联用户员工表'
;
ALTER
TABLE
mortals_xhx_user
ADD
COLUMN
`openId`
varchar
(
64
)
COMMENT
'微信openId'
;
ALTER
TABLE
mortals_xhx_user
ADD
COLUMN
`openId`
varchar
(
64
)
COMMENT
'微信openId'
;
...
@@ -108,3 +108,10 @@ CREATE TABLE mortals_xhx_news_up(
...
@@ -108,3 +108,10 @@ CREATE TABLE mortals_xhx_news_up(
PRIMARY
KEY
(
`id`
)
PRIMARY
KEY
(
`id`
)
,
KEY
`upName`
(
`upName`
)
USING
BTREE
,
KEY
`upName`
(
`upName`
)
USING
BTREE
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'新闻点赞记录信息'
;
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'新闻点赞记录信息'
;
-- ----------------------------
-- 2024-12-5
-- ----------------------------
ALTER
TABLE
mortals_xhx_company
ADD
COLUMN
`background`
varchar
(
256
)
default
''
COMMENT
'背景图片'
;
enterprise-manager/pom.xml
View file @
f5a933de
...
@@ -14,6 +14,22 @@
...
@@ -14,6 +14,22 @@
<version>
1.0.0-SNAPSHOT
</version>
<version>
1.0.0-SNAPSHOT
</version>
</parent>
</parent>
<properties>
<!-- 默认值 -->
<profiles.server.debug></profiles.server.debug>
<profiles.server.path>
/enterprise
</profiles.server.path>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.log.level>
info
</profiles.log.level>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.filepath>
/mortals/app/data
</profiles.filepath>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.req.json.check>
false
</profiles.req.json.check>
<profiles.trustedReferer></profiles.trustedReferer>
<package.environment>
build
</package.environment>
<skipUi>
true
</skipUi>
</properties>
<profiles>
<profiles>
<profile>
<profile>
<id>
develop
</id>
<id>
develop
</id>
...
@@ -42,6 +58,7 @@
...
@@ -42,6 +58,7 @@
<profiles.active>
test
</profiles.active>
<profiles.active>
test
</profiles.active>
<profiles.platform.type>
standalone
</profiles.platform.type>
<profiles.platform.type>
standalone
</profiles.platform.type>
<profiles.server.port>
21086
</profiles.server.port>
<profiles.server.port>
21086
</profiles.server.port>
<profiles.server.debug>
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6519
</profiles.server.debug>
<profiles.server.path>
/enterprise
</profiles.server.path>
<profiles.server.path>
/enterprise
</profiles.server.path>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.nacos.server-addr>
192.168.0.252:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
192.168.0.252:8848
</profiles.nacos.server-addr>
...
@@ -55,36 +72,25 @@
...
@@ -55,36 +72,25 @@
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.log.level>
INFO
</profiles.log.level>
<profiles.log.level>
INFO
</profiles.log.level>
<package.environment>
test
</package.environment>
<package.environment>
test
</package.environment>
<skipUi>
fals
e
</skipUi>
<skipUi>
tru
e
</skipUi>
</properties>
</properties>
</profile>
</profile>
<profile>
<profile>
<id>
product
</id>
<id>
product
</id>
<properties>
<properties>
<profiles.active>
product
</profiles.active>
<profiles.active>
product
</profiles.active>
<profiles.platform.type>
cloud
</profiles.platform.type>
<profiles.platform.type>
standalone
</profiles.platform.type>
<profiles.server.port>
11086
</profiles.server.port>
<profiles.server.port>
21086
</profiles.server.port>
<profiles.server.path>
/office
</profiles.server.path>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
172.15.28.120:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.rabbitmq.host>
172.15.28.115
</profiles.rabbitmq.host>
<package.environment>
build:prod
</package.environment>
<profiles.rabbitmq.port>
5672
</profiles.rabbitmq.port>
<skipDeploy>
true
</skipDeploy>
<profiles.rabbitmq.username>
taxi_mq
</profiles.rabbitmq.username>
<profiles.rabbitmq.password>
admin@2020
</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>
/
</profiles.rabbitmq.virtualhost>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.log.level>
info
</profiles.log.level>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<package.environment>
build
</package.environment>
<skipUi>
false
</skipUi>
</properties>
</properties>
</profile>
</profile>
</profiles>
</profiles>
<properties>
</properties>
<dependencies>
<dependencies>
...
...
enterprise-manager/src/main/bin/deploy.sh
View file @
f5a933de
...
@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
...
@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
JAVA_HOME
=
"/usr/local/java/jdk1.8"
JAVA_HOME
=
"/usr/local/java/jdk1.8"
SERVICE_PATH
=
"/usr/lib/systemd/system"
SERVICE_PATH
=
"/usr/lib/systemd/system"
PUBLISH_PATH
=
"
@profiles.publish.path@
"
PUBLISH_PATH
=
"
/home/publish
"
PROJECT_NAME
=
"@project.artifactId@"
PROJECT_NAME
=
"@project.artifactId@"
PROJECT_EXECPATH
=
"
${
PUBLISH_PATH
}
/
${
PROJECT_NAME
}
"
PROJECT_EXECPATH
=
"
${
PUBLISH_PATH
}
/
${
PROJECT_NAME
}
"
...
@@ -35,7 +35,7 @@ clear_deploy() {
...
@@ -35,7 +35,7 @@ clear_deploy() {
SERVICE
=
$1
SERVICE
=
$1
EXECPATH
=
$2
EXECPATH
=
$2
#清理后台自启服务
#清理后台自启服务
rm
-
r
f
${
SERVICE
}
rm
-f
${
SERVICE
}
#清理执行文件目录
#清理执行文件目录
rm
-rf
${
EXECPATH
}
rm
-rf
${
EXECPATH
}
}
}
...
@@ -58,6 +58,7 @@ build_service() {
...
@@ -58,6 +58,7 @@ build_service() {
echo
"[Service]"
>>
${
SERVICE
}
echo
"[Service]"
>>
${
SERVICE
}
echo
"Environment=
\"
JAVA_HOME=
$JAVA_HOME
\"
"
>>
${
SERVICE
}
echo
"Environment=
\"
JAVA_HOME=
$JAVA_HOME
\"
"
>>
${
SERVICE
}
echo
"Type=forking"
>>
${
SERVICE
}
echo
"Type=forking"
>>
${
SERVICE
}
echo
"ExecStartPre=-/bin/sleep 5s"
>>
${
SERVICE
}
echo
"ExecStart=
${
EXECPATH
}
/bin/start.sh"
>>
${
SERVICE
}
echo
"ExecStart=
${
EXECPATH
}
/bin/start.sh"
>>
${
SERVICE
}
echo
"ExecStop=
${
EXECPATH
}
/bin/shutdown.sh"
>>
${
SERVICE
}
echo
"ExecStop=
${
EXECPATH
}
/bin/shutdown.sh"
>>
${
SERVICE
}
echo
"PrivateTmp=true"
>>
${
SERVICE
}
echo
"PrivateTmp=true"
>>
${
SERVICE
}
...
@@ -103,8 +104,11 @@ project_ui_deploy() {
...
@@ -103,8 +104,11 @@ project_ui_deploy() {
main
()
{
main
()
{
echo
"后台服务部署"
echo
"后台服务部署"
project_deploy
project_deploy
echo
"前端服务部署"
#判断是否需要部署ui
project_ui_deploy
if
[
"@skipUi@"
==
"false"
]
;
then
echo
"前端服务部署"
project_ui_deploy
fi
;
exit
${
RETVAL
}
exit
${
RETVAL
}
}
}
...
...
enterprise-manager/src/main/bin/shutdown.sh
View file @
f5a933de
#!
/bin/sh
#!/bin/sh
PORT
=
"@profiles.server.port@"
PORT
=
"@profiles.server.port@"
BASEDIR
=
$(
dirname
$0
)
BASEDIR
=
`
dirname
$0
`
BASEDIR
=
$(
(
BASEDIR
=
`
(
cd
"
$BASEDIR
"
;
pwd
)
`
cd
"
$BASEDIR
"
pwd
)
)
PROJECT_NAME
=
"@project.artifactId@"
PROJECT_NAME
=
"@project.artifactId@"
MAIN_CLASS
=
"
$PROJECT_NAME
"
MAIN_CLASS
=
"
$PROJECT_NAME
"
;
SUCCESS
=
0
if
[
!
-n
"
$PORT
"
]
;
then
FAIL
=
9
echo
$"Usage:
$0
{port}"
if
[
!
-n
"
$PORT
"
]
;
then
exit
$FAIL
echo
$"Usage:
$0
{port}"
exit
$FAIL
fi
fi
pid
=
$(
ps ax |
grep
-i
"
$MAIN_CLASS
"
|
grep
java |
grep
-v
grep
|
awk
'{print $1}'
)
if
[
-z
"
$pid
"
]
;
then
pid
=
`
ps ax |
grep
-i
"
$MAIN_CLASS
"
|
grep
java |
grep
-v
grep
|
awk
'{print $1}'
`
echo
"No Server running."
if
[
-z
"
$pid
"
]
;
then
exit
1
echo
"No Server running."
exit
$FAIL
;
fi
fi
echo
"stoping application
$PROJECT_NAME
......"
echo
"stoping application
$PROJECT_NAME
......"
...
@@ -24,3 +23,5 @@ echo "stoping application $PROJECT_NAME......"
...
@@ -24,3 +23,5 @@ echo "stoping application $PROJECT_NAME......"
kill
-15
${
pid
}
kill
-15
${
pid
}
echo
"Send shutdown request to Server
$PROJECT_NAME
OK"
echo
"Send shutdown request to Server
$PROJECT_NAME
OK"
enterprise-manager/src/main/bin/start.sh
View file @
f5a933de
#!/bin/sh
#!/bin/sh
PORT
=
"@profiles.server.port@"
PORT
=
"@profiles.server.port@"
DEBUG
=
@profiles.server.debug@
BASEDIR
=
`
dirname
$0
`
/..
BASEDIR
=
`
dirname
$0
`
/..
BASEDIR
=
`
(
cd
"
$BASEDIR
"
;
pwd
)
`
BASEDIR
=
`
(
cd
"
$BASEDIR
"
;
pwd
)
`
PROJECT_NAME
=
"@project.artifactId@"
;
PROJECT_NAME
=
"@project.artifactId@"
;
MAIN_CLASS
=
"
$PROJECT_NAME
-@project.version@.jar"
;
MAIN_CLASS
=
"
$PROJECT_NAME
-@project.version@.jar"
;
LOG_PATH
=
"@profiles.log.path@/
$PROJECT_NAME
"
LOG_PATH
=
"@profiles.log.path@/
$PROJECT_NAME
"
GC_PATH
=
$LOG_PATH
/PROJECT_NAME
"-gc.log"
GC_PATH
=
$LOG_PATH
/
$
PROJECT_NAME
"-gc.log"
HS_ERR_PATH
=
$LOG_PATH
/PROJECT_NAME
"-hs_err.log"
HS_ERR_PATH
=
$LOG_PATH
/
$
PROJECT_NAME
"-hs_err.log"
HEAP_DUMP_PATH
=
$LOG_PATH
/PROJECT_NAME
"-heap_dump.hprof"
HEAP_DUMP_PATH
=
$LOG_PATH
/
$
PROJECT_NAME
"-heap_dump.hprof"
TEMP_PATH
=
$LOG_PATH
/temp/
TEMP_PATH
=
$LOG_PATH
/temp/
SUCCESS
=
0
SUCCESS
=
0
FAIL
=
9
FAIL
=
9
...
@@ -32,8 +33,9 @@ if [ -z "$JAVACMD" ] ; then
...
@@ -32,8 +33,9 @@ if [ -z "$JAVACMD" ] ; then
JAVACMD
=
"
$JAVA_HOME
/bin/java"
JAVACMD
=
"
$JAVA_HOME
/bin/java"
fi
fi
else
else
JAVACMD
=
`
which java
`
JAVACMD
=
`
which java
>
/dev/null 2>&1
`
echo
"Error: JAVA_HOME is
$JAVACMD
"
echo
"Error: JAVA_HOME is not defined correctly."
exit
$ERR_NO_JAVA
fi
fi
fi
fi
...
@@ -44,7 +46,7 @@ fi
...
@@ -44,7 +46,7 @@ fi
if
[
-e
"
$BASEDIR
"
]
if
[
-e
"
$BASEDIR
"
]
then
then
JAVA_OPTS
=
"-Xms
512M -Xmx1024
M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:
$GC_PATH
-XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=
$HS_ERR_PATH
-XX:HeapDumpPath=
$HEAP_DUMP_PATH
"
JAVA_OPTS
=
"-Xms
128M -Xmx512
M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:
$GC_PATH
-XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=
$HS_ERR_PATH
-XX:HeapDumpPath=
$HEAP_DUMP_PATH
"
fi
fi
CLASSPATH
=
$CLASSPATH_PREFIX
:
CLASSPATH
=
$CLASSPATH_PREFIX
:
...
@@ -55,12 +57,12 @@ cd "$BASEDIR/boot";
...
@@ -55,12 +57,12 @@ cd "$BASEDIR/boot";
echo
"starting application
$PROJECT_NAME
......"
echo
"starting application
$PROJECT_NAME
......"
exec
"
$JAVACMD
"
$JAVA_OPTS
\
exec
"
$JAVACMD
"
$JAVA_OPTS
\
$EXTRA_JVM_ARGUMENTS
\
$EXTRA_JVM_ARGUMENTS
\
$DEBUG
\
-Dapp
.name
=
"
$PROJECT_NAME
"
\
-Dapp
.name
=
"
$PROJECT_NAME
"
\
-Dapp
.port
=
"
$PORT
"
\
-Dapp
.port
=
"
$PORT
"
\
-Dbasedir
=
"
$BASEDIR
"
\
-Dbasedir
=
"
$BASEDIR
"
\
-Dfile
.encoding
=
utf-8
\
-Djava
.io.tmpdir
=
$TEMP_PATH
\
-Djava
.io.tmpdir
=
$TEMP_PATH
\
-Dloader
.path
=
"file://
$BASEDIR
/conf,file://
$BASEDIR
/lib"
\
-agentlib
:jdwp
=
transport
=
dt_socket,server
=
y,suspend
=
n,address
=
41086
\
-jar
$MAIN_CLASS
\
-jar
$MAIN_CLASS
\
>
/dev/null &
>
/dev/null &
...
...
enterprise-manager/src/main/java/com/mortals/xhx/busiz/controller/TestIdempotentController.java
View file @
f5a933de
package
com.mortals.xhx.busiz.controller
;
package
com.mortals.xhx.busiz.controller
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.idempotent.helper.IdempotentHelper
;
import
com.mortals.framework.idempotent.helper.IdempotentHelper
;
import
com.mortals.xhx.busiz.service.TestIdempotentService
;
import
com.mortals.xhx.busiz.service.TestIdempotentService
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -28,6 +29,7 @@ public class TestIdempotentController {
...
@@ -28,6 +29,7 @@ public class TestIdempotentController {
* url: localhost:12345/v1/idempotent/test-with-result?source=taobao&operationType=publish_product&businessKey=pd_20230105007&name=lisi
* url: localhost:12345/v1/idempotent/test-with-result?source=taobao&operationType=publish_product&businessKey=pd_20230105007&name=lisi
*/
*/
@GetMapping
(
"/test-with-result"
)
@GetMapping
(
"/test-with-result"
)
@UnAuth
public
String
testWithResult
(
String
source
,
public
String
testWithResult
(
String
source
,
String
operationType
,
String
operationType
,
String
businessKey
,
String
businessKey
,
...
@@ -44,6 +46,7 @@ public class TestIdempotentController {
...
@@ -44,6 +46,7 @@ public class TestIdempotentController {
* url : localhost:12345/v1/idempotent/test-with-no-result?source=taobao&operationType=publish_product&businessKey=pd_20230105008&name=zhangsan
* url : localhost:12345/v1/idempotent/test-with-no-result?source=taobao&operationType=publish_product&businessKey=pd_20230105008&name=zhangsan
*/
*/
@GetMapping
(
"/test-with-no-result"
)
@GetMapping
(
"/test-with-no-result"
)
@UnAuth
public
String
testWithNoResult
(
String
source
,
public
String
testWithNoResult
(
String
source
,
String
operationType
,
String
operationType
,
String
businessKey
,
String
businessKey
,
...
...
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyEntity.java
View file @
f5a933de
...
@@ -13,150 +13,154 @@ import com.mortals.xhx.module.company.model.vo.CompanyVo;
...
@@ -13,150 +13,154 @@ import com.mortals.xhx.module.company.model.vo.CompanyVo;
import
com.mortals.xhx.module.company.model.CompanyLabelsEntity
;
import
com.mortals.xhx.module.company.model.CompanyLabelsEntity
;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
* 公司实体对象
* 公司实体对象
*
*
* @author zxfei
* @author zxfei
* @date 2023-09-18
* @date 2024-12-05
*/
*/
@Data
@Data
public
class
CompanyEntity
extends
CompanyVo
{
public
class
CompanyEntity
extends
CompanyVo
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/**
/**
* 公司名称
* 公司名称
*/
*/
@Excel
(
name
=
"公司名称"
)
@Excel
(
name
=
"公司名称"
)
private
String
companyName
;
private
String
companyName
;
/**
/**
* 公司编码
* 公司编码
*/
*/
private
String
companyCode
;
private
String
companyCode
;
/**
/**
* 注册号
* 注册号
*/
*/
private
String
registrationNumber
;
private
String
registrationNumber
;
/**
/**
* 法定代表人
* 法定代表人
*/
*/
private
String
legalRepresentative
;
private
String
legalRepresentative
;
/**
/**
* 注册资本
* 注册资本
*/
*/
private
String
registeredCapital
;
private
String
registeredCapital
;
/**
/**
* 公司类型
* 公司类型
*/
*/
private
String
companyType
;
private
String
companyType
;
/**
/**
* 经营范围
* 经营范围
*/
*/
private
String
businessScope
;
private
String
businessScope
;
/**
/**
* 经营地址
* 经营地址
*/
*/
private
String
businessAdress
;
private
String
businessAdress
;
/**
/**
* 所在地
* 所在地
*/
*/
private
String
location
;
private
String
location
;
/**
/**
* 所属区域编码
* 所属区域编码
*/
*/
private
String
areaCode
;
private
String
areaCode
;
/**
/**
* 所属区域名称
* 所属区域名称
*/
*/
private
String
areaName
;
private
String
areaName
;
/**
/**
* 联系电话
* 联系电话
*/
*/
private
String
contactPhone
;
private
String
contactPhone
;
/**
/**
* 电子邮件地址
* 电子邮件地址
*/
*/
private
String
email
;
private
String
email
;
/**
/**
* 公司网站
* 公司网站
*/
*/
private
String
website
;
private
String
website
;
/**
/**
* 税务登记号
* 税务登记号
*/
*/
private
String
taxRegistrationNumber
;
private
String
taxRegistrationNumber
;
/**
/**
* 社会信用代码
* 社会信用代码
*/
*/
private
String
socialCreditCode
;
private
String
socialCreditCode
;
/**
/**
* 商标信息
* 商标信息
*/
*/
private
String
trademarkInfo
;
private
String
trademarkInfo
;
/**
/**
* 网站历史备案信息
* 网站历史备案信息
*/
*/
private
String
websiteRegistrationInfo
;
private
String
websiteRegistrationInfo
;
/**
/**
* 员工总数
* 员工总数
*/
*/
private
Integer
totalEmployees
;
private
Integer
totalEmployees
;
/**
/**
* 软件著作权数量
* 软件著作权数量
*/
*/
private
Integer
softNum
;
private
Integer
softNum
;
/**
/**
* 专利数量
* 专利数量
*/
*/
private
Integer
patentNum
;
private
Integer
patentNum
;
/**
/**
* 历史发展
* 历史发展
*/
*/
private
String
hisDevelop
;
private
String
hisDevelop
;
/**
/**
* 经度
* 经度
*/
*/
private
String
lon
;
private
String
lon
;
/**
/**
* 纬度
* 纬度
*/
*/
private
String
lati
;
private
String
lati
;
/**
/**
* 企业logo
* 企业logo
*/
*/
private
String
logoPath
;
private
String
logoPath
;
/**
/**
* 企业视频
* 企业视频
*/
*/
private
String
companyVideoPath
;
private
String
companyVideoPath
;
/**
/**
* 企业宣传图片
* 企业宣传图片
*/
*/
private
String
companyPicPath
;
private
String
companyPicPath
;
/**
/**
* 公司介绍
* 公司介绍
*/
*/
private
String
companyIntroduction
;
private
String
companyIntroduction
;
/**
/**
* 公司文化
* 公司文化
*/
*/
private
String
companyCulture
;
private
String
companyCulture
;
/**
/**
* 排序
* 排序
*/
*/
private
Integer
sort
;
private
Integer
sort
;
/**
/**
* 成立日期
* 成立日期
*/
*/
private
Date
establishDate
;
private
Date
establishDate
;
/**
/**
* 备注
* 备注
*/
*/
private
String
remark
;
private
String
remark
;
/**
/**
* 公司标注信息
* 背景图片
*/
*/
private
String
background
;
/**
* 公司标注信息
*/
private
List
<
CompanyLabelsEntity
>
companyLabelsList
=
new
ArrayList
<>();;
private
List
<
CompanyLabelsEntity
>
companyLabelsList
=
new
ArrayList
<>();;
public
List
<
CompanyLabelsEntity
>
getCompanyLabelsList
(){
public
List
<
CompanyLabelsEntity
>
getCompanyLabelsList
(){
return
companyLabelsList
;
return
companyLabelsList
;
}
}
public
void
setCompanyLabelsList
(
List
<
CompanyLabelsEntity
>
companyLabelsList
){
public
void
setCompanyLabelsList
(
List
<
CompanyLabelsEntity
>
companyLabelsList
){
...
@@ -164,7 +168,7 @@ public class CompanyEntity extends CompanyVo {
...
@@ -164,7 +168,7 @@ public class CompanyEntity extends CompanyVo {
}
}
@Override
@Override
public
int
hashCode
()
{
public
int
hashCode
()
{
return
this
.
getId
().
hashCode
();
return
this
.
getId
().
hashCode
();
}
}
@Override
@Override
public
boolean
equals
(
Object
obj
)
{
public
boolean
equals
(
Object
obj
)
{
...
@@ -172,44 +176,45 @@ public class CompanyEntity extends CompanyVo {
...
@@ -172,44 +176,45 @@ public class CompanyEntity extends CompanyVo {
if
(
obj
instanceof
CompanyEntity
)
{
if
(
obj
instanceof
CompanyEntity
)
{
CompanyEntity
tmp
=
(
CompanyEntity
)
obj
;
CompanyEntity
tmp
=
(
CompanyEntity
)
obj
;
if
(
this
.
getId
()
==
tmp
.
getId
())
{
if
(
this
.
getId
()
==
tmp
.
getId
())
{
return
true
;
return
true
;
}
}
}
}
return
false
;
return
false
;
}
}
public
void
initAttrValue
(){
public
void
initAttrValue
(){
this
.
companyName
=
""
;
this
.
companyName
=
""
;
this
.
companyCode
=
""
;
this
.
companyCode
=
""
;
this
.
registrationNumber
=
""
;
this
.
registrationNumber
=
""
;
this
.
legalRepresentative
=
""
;
this
.
legalRepresentative
=
""
;
this
.
registeredCapital
=
""
;
this
.
registeredCapital
=
""
;
this
.
companyType
=
""
;
this
.
companyType
=
""
;
this
.
businessScope
=
""
;
this
.
businessScope
=
""
;
this
.
businessAdress
=
""
;
this
.
businessAdress
=
""
;
this
.
location
=
""
;
this
.
location
=
""
;
this
.
areaCode
=
""
;
this
.
areaCode
=
""
;
this
.
areaName
=
""
;
this
.
areaName
=
""
;
this
.
contactPhone
=
""
;
this
.
contactPhone
=
""
;
this
.
email
=
""
;
this
.
email
=
""
;
this
.
website
=
""
;
this
.
website
=
""
;
this
.
taxRegistrationNumber
=
""
;
this
.
taxRegistrationNumber
=
""
;
this
.
socialCreditCode
=
""
;
this
.
socialCreditCode
=
""
;
this
.
trademarkInfo
=
""
;
this
.
trademarkInfo
=
""
;
this
.
websiteRegistrationInfo
=
""
;
this
.
websiteRegistrationInfo
=
""
;
this
.
totalEmployees
=
0
;
this
.
totalEmployees
=
0
;
this
.
softNum
=
0
;
this
.
softNum
=
0
;
this
.
patentNum
=
0
;
this
.
patentNum
=
0
;
this
.
hisDevelop
=
""
;
this
.
hisDevelop
=
""
;
this
.
lon
=
""
;
this
.
lon
=
""
;
this
.
lati
=
""
;
this
.
lati
=
""
;
this
.
logoPath
=
""
;
this
.
logoPath
=
""
;
this
.
companyVideoPath
=
""
;
this
.
companyVideoPath
=
""
;
this
.
companyPicPath
=
""
;
this
.
companyPicPath
=
""
;
this
.
companyIntroduction
=
""
;
this
.
companyIntroduction
=
""
;
this
.
companyCulture
=
""
;
this
.
companyCulture
=
""
;
this
.
sort
=
0
;
this
.
sort
=
0
;
this
.
establishDate
=
new
Date
();
this
.
establishDate
=
null
;
this
.
remark
=
""
;
this
.
remark
=
""
;
this
.
background
=
""
;
}
}
}
}
\ No newline at end of file
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyQuery.java
View file @
f5a933de
This diff is collapsed.
Click to expand it.
enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java
View file @
f5a933de
...
@@ -86,7 +86,34 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
...
@@ -86,7 +86,34 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
@Autowired
@Autowired
private
LabelsService
labelsService
;
private
LabelsService
labelsService
;
@Override
protected
void
findAfter
(
CompanyEntity
params
,
PageInfo
pageInfo
,
Context
context
,
List
<
CompanyEntity
>
list
)
throws
AppException
{
fillSubData
(
list
);
super
.
findAfter
(
params
,
pageInfo
,
context
,
list
);
}
@Override
protected
void
findAfter
(
CompanyEntity
params
,
Context
context
,
List
<
CompanyEntity
>
list
)
throws
AppException
{
fillSubData
(
list
);
super
.
findAfter
(
params
,
context
,
list
);
}
private
void
fillSubData
(
List
<
CompanyEntity
>
list
)
{
List
<
Long
>
idList
=
list
.
stream
().
map
(
i
->
i
.
getId
()).
collect
(
Collectors
.
toList
());
if
(
ObjectUtils
.
isEmpty
(
idList
))
return
;
Map
<
Long
,
List
<
CompanyLabelsEntity
>>
companyLabelsListMap
=
companyLabelsService
.
find
(
new
CompanyLabelsQuery
().
companyIdList
(
idList
)).
parallelStream
()
.
collect
(
Collectors
.
groupingBy
(
CompanyLabelsEntity:
:
getCompanyId
));
List
<
CompanyPatentEntity
>
companyPatentEntities
=
companyPatentService
.
find
(
new
CompanyPatentQuery
().
companyIdList
(
idList
));
Map
<
Long
,
List
<
CompanyPatentEntity
>>
companyPatentListMap
=
companyPatentEntities
.
parallelStream
().
collect
((
Collectors
.
groupingBy
(
CompanyPatentEntity:
:
getCompanyId
)));
list
.
forEach
(
item
->
{
item
.
setCompanyLabelsList
(
companyLabelsListMap
.
get
(
item
.
getId
()));
item
.
setCompanyPatentsList
(
companyPatentListMap
.
get
(
item
.
getId
()));
});
}
/*
@Override
@Override
protected void findAfter(CompanyEntity params, PageInfo pageInfo, Context context, List<CompanyEntity> list) throws AppException {
protected void findAfter(CompanyEntity params, PageInfo pageInfo, Context context, List<CompanyEntity> list) throws AppException {
...
@@ -95,6 +122,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
...
@@ -95,6 +122,7 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
item.setCompanyPatentsList(companyPatentEntities);
item.setCompanyPatentsList(companyPatentEntities);
}).count();
}).count();
}
}
*/
@Override
@Override
protected
void
saveAfter
(
CompanyEntity
entity
,
Context
context
)
throws
AppException
{
protected
void
saveAfter
(
CompanyEntity
entity
,
Context
context
)
throws
AppException
{
...
...
enterprise-manager/src/main/java/com/mortals/xhx/module/company/web/CompanyController.java
View file @
f5a933de
...
@@ -7,8 +7,7 @@ import com.mortals.framework.exception.AppException;
...
@@ -7,8 +7,7 @@ import com.mortals.framework.exception.AppException;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.module.company.model.CompanyPatentEntity
;
import
com.mortals.xhx.module.company.model.*
;
import
com.mortals.xhx.module.company.model.CompanyPatentQuery
;
import
com.mortals.xhx.module.company.model.vo.HomeStatInfo
;
import
com.mortals.xhx.module.company.model.vo.HomeStatInfo
;
import
com.mortals.xhx.module.company.service.CompanyLabelsService
;
import
com.mortals.xhx.module.company.service.CompanyLabelsService
;
import
com.mortals.xhx.module.company.service.CompanyPatentService
;
import
com.mortals.xhx.module.company.service.CompanyPatentService
;
...
@@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.module.company.model.CompanyEntity
;
import
com.mortals.xhx.module.company.service.CompanyService
;
import
com.mortals.xhx.module.company.service.CompanyService
;
import
org.apache.commons.lang3.ArrayUtils
;
import
org.apache.commons.lang3.ArrayUtils
;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.framework.util.StringUtils
;
...
@@ -62,6 +60,9 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
...
@@ -62,6 +60,9 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
private
LabelsService
labelsService
;
private
LabelsService
labelsService
;
@Autowired
@Autowired
private
CompanyPatentService
companyPatentService
;
private
CompanyPatentService
companyPatentService
;
@Autowired
private
CompanyLabelsService
companyLabelsService
;
public
CompanyController
()
{
public
CompanyController
()
{
...
@@ -84,6 +85,10 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
...
@@ -84,6 +85,10 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
protected
int
editAfter
(
Long
id
,
Map
<
String
,
Object
>
model
,
CompanyEntity
entity
,
Context
context
)
throws
AppException
{
protected
int
editAfter
(
Long
id
,
Map
<
String
,
Object
>
model
,
CompanyEntity
entity
,
Context
context
)
throws
AppException
{
List
<
CompanyPatentEntity
>
companyPatentEntities
=
companyPatentService
.
find
(
new
CompanyPatentQuery
().
companyId
(
entity
.
getId
()));
List
<
CompanyPatentEntity
>
companyPatentEntities
=
companyPatentService
.
find
(
new
CompanyPatentQuery
().
companyId
(
entity
.
getId
()));
List
<
CompanyLabelsEntity
>
companyLabelsEntities
=
companyLabelsService
.
find
(
new
CompanyLabelsQuery
().
companyId
(
entity
.
getId
()));
entity
.
setCompanyLabelsList
(
companyLabelsEntities
);
entity
.
setCompanyPatentsList
(
companyPatentEntities
);
entity
.
setCompanyPatentsList
(
companyPatentEntities
);
...
@@ -95,6 +100,8 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
...
@@ -95,6 +100,8 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
protected
int
viewAfter
(
Long
id
,
Map
<
String
,
Object
>
model
,
CompanyEntity
entity
,
Context
context
)
throws
AppException
{
protected
int
viewAfter
(
Long
id
,
Map
<
String
,
Object
>
model
,
CompanyEntity
entity
,
Context
context
)
throws
AppException
{
List
<
CompanyPatentEntity
>
companyPatentEntities
=
companyPatentService
.
find
(
new
CompanyPatentQuery
().
companyId
(
entity
.
getId
()));
List
<
CompanyPatentEntity
>
companyPatentEntities
=
companyPatentService
.
find
(
new
CompanyPatentQuery
().
companyId
(
entity
.
getId
()));
List
<
CompanyLabelsEntity
>
companyLabelsEntities
=
companyLabelsService
.
find
(
new
CompanyLabelsQuery
().
companyId
(
entity
.
getId
()));
entity
.
setCompanyLabelsList
(
companyLabelsEntities
);
entity
.
setCompanyPatentsList
(
companyPatentEntities
);
entity
.
setCompanyPatentsList
(
companyPatentEntities
);
return
super
.
viewAfter
(
id
,
model
,
entity
,
context
);
return
super
.
viewAfter
(
id
,
model
,
entity
,
context
);
...
...
enterprise-manager/src/main/java/com/mortals/xhx/module/news/service/impl/NewsServiceImpl.java
View file @
f5a933de
...
@@ -54,7 +54,7 @@ public class NewsServiceImpl extends AbstractCRUDServiceImpl<NewsDao, NewsEntity
...
@@ -54,7 +54,7 @@ public class NewsServiceImpl extends AbstractCRUDServiceImpl<NewsDao, NewsEntity
List
<
NewsUpEntity
>
upList
=
newsUpService
.
find
(
new
NewsUpQuery
().
newsIdList
(
newsIdList
).
upId
(
context
.
getUser
().
getId
()));
List
<
NewsUpEntity
>
upList
=
newsUpService
.
find
(
new
NewsUpQuery
().
newsIdList
(
newsIdList
).
upId
(
context
.
getUser
().
getId
()));
Map
<
Long
,
NewsUpEntity
>
upMap
=
new
HashMap
<>();
Map
<
Long
,
NewsUpEntity
>
upMap
=
new
HashMap
<>();
if
(
CollectionUtils
.
isNotEmpty
(
upList
)){
if
(
CollectionUtils
.
isNotEmpty
(
upList
)){
upMap
=
upList
.
parallelStream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
(),
z
->
z
,
(
o
,
n
)
->
n
));
upMap
=
upList
.
parallelStream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
get
News
Id
(),
z
->
z
,
(
o
,
n
)
->
n
));
}
}
List
<
NewsShareEntity
>
shareList
=
newsShareService
.
find
(
new
NewsShareQuery
().
newsIdList
(
newsIdList
).
createUserId
(
context
.
getUser
().
getId
()));
List
<
NewsShareEntity
>
shareList
=
newsShareService
.
find
(
new
NewsShareQuery
().
newsIdList
(
newsIdList
).
createUserId
(
context
.
getUser
().
getId
()));
Map
<
Long
,
NewsShareEntity
>
shareMap
=
new
HashMap
<>();
Map
<
Long
,
NewsShareEntity
>
shareMap
=
new
HashMap
<>();
...
...
enterprise-manager/src/main/resources/sqlmap/module/company/CompanyMapper.xml
View file @
f5a933de
This diff is collapsed.
Click to expand it.
enterprise-manager/src/test/java/com/mortals/httpclient/company/CompanyController.http
View file @
f5a933de
...
@@ -14,10 +14,11 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
...
@@ -14,10 +14,11 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
%}
%}
###公司列表
###公司列表
POST {{baseUrl}}/company/list
POST {{baseUrl}}/company/
inter
list
Content-Type: application/json
Content-Type: application/json
{
{
"id": 5,
"page":1,
"page":1,
"size":10
"size":10
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment