Merge branch 'master' of http://gitlab.scsmile.cn/zxf/enterprise-platform

db/add.sql

 -- ----------------------------
-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  `openId` varchar(64)      COMMENT '微信openId';
@@ -108,3 +108,10 @@ CREATE TABLE mortals_xhx_news_up(
 PRIMARY KEY  (`id`)
 ,KEY `upName` (`upName`) USING BTREE
 ) 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

@@ -14,6 +14,22 @@
         <version>1.0.0-SNAPSHOT</version>
     </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>
         <profile>
             <id>develop</id>
@@ -42,6 +58,7 @@
                 <profiles.active>test</profiles.active>
                 <profiles.platform.type>standalone</profiles.platform.type>
                 <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.publish.path>/home/publish</profiles.publish.path>
                 <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
@@ -55,36 +72,25 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>INFO</profiles.log.level>
                 <package.environment>test</package.environment>
-                <skipUi>false</skipUi>
+                <skipUi>true</skipUi>
             </properties>
         </profile>
         <profile>
             <id>product</id>
             <properties>
                 <profiles.active>product</profiles.active>
-                <profiles.platform.type>cloud</profiles.platform.type>
-                <profiles.server.port>11086</profiles.server.port>
-                <profiles.server.path>/office</profiles.server.path>
-                <profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
+                <profiles.platform.type>standalone</profiles.platform.type>
+                <profiles.server.port>21086</profiles.server.port>
+                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.rabbitmq.host>172.15.28.115</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <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>
+                <package.environment>build:prod</package.environment>
+                <skipDeploy>true</skipDeploy>
             </properties>
         </profile>
 
     </profiles>
 
-    <properties>
-    </properties>
 
     <dependencies>
 

enterprise-manager/src/main/bin/deploy.sh

@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
 
 JAVA_HOME="/usr/local/java/jdk1.8"
 SERVICE_PATH="/usr/lib/systemd/system"
-PUBLISH_PATH="@profiles.publish.path@"
+PUBLISH_PATH="/home/publish"
 PROJECT_NAME="@project.artifactId@"
 
 PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
@@ -35,7 +35,7 @@ clear_deploy() {
   SERVICE=$1
   EXECPATH=$2
   #清理后台自启服务
-  rm -rf ${SERVICE}
+  rm -f ${SERVICE}
   #清理执行文件目录
   rm -rf ${EXECPATH}
 }
@@ -58,6 +58,7 @@ build_service() {
   echo "[Service]" >>${SERVICE}
   echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>${SERVICE}
   echo "Type=forking" >>${SERVICE}
+  echo "ExecStartPre=-/bin/sleep 5s" >>${SERVICE}
   echo "ExecStart=${EXECPATH}/bin/start.sh" >>${SERVICE}
   echo "ExecStop=${EXECPATH}/bin/shutdown.sh" >>${SERVICE}
   echo "PrivateTmp=true" >>${SERVICE}
@@ -103,8 +104,11 @@ project_ui_deploy() {
 main() {
   echo "后台服务部署"
   project_deploy
+  #判断是否需要部署ui
+  if [ "@skipUi@" == "false" ];then
     echo "前端服务部署"
     project_ui_deploy
+  fi;
   exit ${RETVAL}
 }
 

enterprise-manager/src/main/bin/shutdown.sh

-#! /bin/sh
+#!/bin/sh
 PORT="@profiles.server.port@"
-BASEDIR=$(dirname $0)
-BASEDIR=$( (
-  cd "$BASEDIR"
-  pwd
-))
+BASEDIR=`dirname $0`
+BASEDIR=`(cd "$BASEDIR"; pwd)`
 PROJECT_NAME="@project.artifactId@"
-MAIN_CLASS="$PROJECT_NAME"
-
+MAIN_CLASS="$PROJECT_NAME";
+SUCCESS=0
+FAIL=9
 if [ ! -n "$PORT" ]; then  
 	echo $"Usage: $0 {port}"
 	exit $FAIL
 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}'`
+if [ -z "$pid" ] ; then
         echo "No Server running."
-  exit 1
+        exit $FAIL;
 fi
 
 echo "stoping application $PROJECT_NAME......"
@@ -24,3 +23,5 @@ echo "stoping application $PROJECT_NAME......"
 kill -15 ${pid}
 
 echo "Send shutdown request to Server $PROJECT_NAME OK"
+
+

enterprise-manager/src/main/bin/start.sh

 #!/bin/sh
 PORT="@profiles.server.port@"
+DEBUG=@profiles.server.debug@
 BASEDIR=`dirname $0`/..
 BASEDIR=`(cd "$BASEDIR"; pwd)`
 PROJECT_NAME="@project.artifactId@";
 MAIN_CLASS="$PROJECT_NAME-@project.version@.jar";
 LOG_PATH="@profiles.log.path@/$PROJECT_NAME"
-GC_PATH=$LOG_PATH/PROJECT_NAME"-gc.log"
-HS_ERR_PATH=$LOG_PATH/PROJECT_NAME"-hs_err.log"
-HEAP_DUMP_PATH=$LOG_PATH/PROJECT_NAME"-heap_dump.hprof"
+GC_PATH=$LOG_PATH/$PROJECT_NAME"-gc.log"
+HS_ERR_PATH=$LOG_PATH/$PROJECT_NAME"-hs_err.log"
+HEAP_DUMP_PATH=$LOG_PATH/$PROJECT_NAME"-heap_dump.hprof"
 TEMP_PATH=$LOG_PATH/temp/
 SUCCESS=0
 FAIL=9
@@ -32,8 +33,9 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD=`which java`
-	echo  "Error: JAVA_HOME is $JAVACMD"
+    JAVACMD=`which java > /dev/null 2>&1`
+	echo  "Error: JAVA_HOME is not defined correctly."
+    exit $ERR_NO_JAVA
   fi
 fi
 
@@ -44,7 +46,7 @@ fi
 
 if [ -e "$BASEDIR" ]
 then
-  JAVA_OPTS="-Xms512M -Xmx1024M -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="-Xms128M -Xmx512M -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
 
 CLASSPATH=$CLASSPATH_PREFIX:
@@ -55,12 +57,12 @@ cd "$BASEDIR/boot";
 echo "starting application $PROJECT_NAME......"
 exec "$JAVACMD" $JAVA_OPTS \
 				$EXTRA_JVM_ARGUMENTS \
+				$DEBUG \
 				-Dapp.name="$PROJECT_NAME" \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
+				-Dfile.encoding=utf-8 \
 				-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 \
 				> /dev/null &
 				

enterprise-manager/src/main/java/com/mortals/xhx/busiz/controller/TestIdempotentController.java

 package com.mortals.xhx.busiz.controller;
 
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.idempotent.helper.IdempotentHelper;
 import com.mortals.xhx.busiz.service.TestIdempotentService;
 import lombok.extern.slf4j.Slf4j;
@@ -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
      */
     @GetMapping("/test-with-result")
+    @UnAuth
     public String testWithResult(String source,
                                  String operationType,
                                  String businessKey,
@@ -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
      */
     @GetMapping("/test-with-no-result")
+    @UnAuth
     public String testWithNoResult(String source,
                                    String operationType,
                                    String businessKey,

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyEntity.java

@@ -13,11 +13,11 @@ import com.mortals.xhx.module.company.model.vo.CompanyVo;
 import com.mortals.xhx.module.company.model.CompanyLabelsEntity;
 import lombok.Data;
 /**
-* 公司实体对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司实体对象
+ *
+ * @author zxfei
+ * @date 2024-12-05
+ */
 @Data
 public class CompanyEntity extends CompanyVo {
     private static final long serialVersionUID = 1L;
@@ -151,6 +151,10 @@ public class CompanyEntity extends CompanyVo {
      * 备注
      */
     private String remark;
+    /**
+     * 背景图片
+     */
+    private String background;
     /**
      * 公司标注信息
      */
@@ -209,7 +213,8 @@ public class CompanyEntity extends CompanyVo {
         this.companyIntroduction = "";
         this.companyCulture = "";
         this.sort = 0;
-            this.establishDate = new Date();
+        this.establishDate = null;
         this.remark = "";
+        this.background = "";
     }
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyQuery.java

@@ -5,11 +5,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.company.model.CompanyEntity;
 /**
-* 公司查询对象
-*
-* @author zxfei
-* @date 2023-09-18
-*/
+ * 公司查询对象
+ *
+ * @author zxfei
+ * @date 2024-12-05
+ */
 public class CompanyQuery extends CompanyEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -269,6 +269,11 @@ public class CompanyQuery extends CompanyEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 背景图片 */
+    private List<String> backgroundList;
+
+    /** 背景图片排除列表 */
+    private List <String> backgroundNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CompanyQuery> orConditionList;
 
@@ -1804,6 +1809,38 @@ public class CompanyQuery extends CompanyEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 背景图片
+     * @return backgroundList
+     */
+    public List<String> getBackgroundList(){
+        return this.backgroundList;
+    }
+
+    /**
+     * 设置 背景图片
+     * @param backgroundList
+     */
+    public void setBackgroundList(List<String> backgroundList){
+        this.backgroundList = backgroundList;
+    }
+
+    /**
+     * 获取 背景图片
+     * @return backgroundNotList
+     */
+    public List<String> getBackgroundNotList(){
+        return this.backgroundNotList;
+    }
+
+    /**
+     * 设置 背景图片
+     * @param backgroundNotList
+     */
+    public void setBackgroundNotList(List<String> backgroundNotList){
+        this.backgroundNotList = backgroundNotList;
+    }
+
     /**
      * 设置  主键ID，主键，自增长
      * @param id
@@ -2698,6 +2735,25 @@ public class CompanyQuery extends CompanyEntity {
     }
 
 
+
+    /**
+     * 设置 背景图片
+     * @param background
+     */
+    public CompanyQuery background(String background){
+        setBackground(background);
+        return this;
+    }
+
+    /**
+     * 设置 背景图片
+     * @param backgroundList
+     */
+    public CompanyQuery backgroundList(List<String> backgroundList){
+        this.backgroundList = backgroundList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

enterprise-manager/src/main/java/com/mortals/xhx/module/company/service/impl/CompanyServiceImpl.java

@@ -86,7 +86,34 @@ public class CompanyServiceImpl extends AbstractCRUDServiceImpl<CompanyDao, Comp
     @Autowired
     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
     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
             item.setCompanyPatentsList(companyPatentEntities);
         }).count();
     }
+*/
 
     @Override
     protected void saveAfter(CompanyEntity entity, Context context) throws AppException {

enterprise-manager/src/main/java/com/mortals/xhx/module/company/web/CompanyController.java

@@ -7,8 +7,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.module.company.model.CompanyPatentEntity;
-import com.mortals.xhx.module.company.model.CompanyPatentQuery;
+import com.mortals.xhx.module.company.model.*;
 import com.mortals.xhx.module.company.model.vo.HomeStatInfo;
 import com.mortals.xhx.module.company.service.CompanyLabelsService;
 import com.mortals.xhx.module.company.service.CompanyPatentService;
@@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.company.model.CompanyEntity;
 import com.mortals.xhx.module.company.service.CompanyService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
@@ -62,6 +60,9 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
     private LabelsService labelsService;
     @Autowired
     private CompanyPatentService companyPatentService;
+    @Autowired
+    private CompanyLabelsService companyLabelsService;
+
 
 
     public CompanyController() {
@@ -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 {
 
         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);
 
 
@@ -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 {
 
         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);
 
         return super.viewAfter(id, model, entity, context);

enterprise-manager/src/main/java/com/mortals/xhx/module/news/service/impl/NewsServiceImpl.java

@@ -54,7 +54,7 @@ public class NewsServiceImpl extends AbstractCRUDServiceImpl<NewsDao, NewsEntity
                 List<NewsUpEntity> upList = newsUpService.find(new NewsUpQuery().newsIdList(newsIdList).upId(context.getUser().getId()));
                 Map<Long,NewsUpEntity> upMap = new HashMap<>();
                 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.getNewsId(), z -> z, (o, n) -> n));
                 }
                 List<NewsShareEntity> shareList = newsShareService.find(new NewsShareQuery().newsIdList(newsIdList).createUserId(context.getUser().getId()));
                 Map<Long,NewsShareEntity> shareMap = new HashMap<>();

enterprise-manager/src/test/java/com/mortals/httpclient/company/CompanyController.http

@@ -14,10 +14,11 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###公司列表
-POST {{baseUrl}}/company/list
+POST {{baseUrl}}/company/interlist
 Content-Type: application/json
 
 {
+  "id": 5,
     "page":1,
     "size":10
 }