添加麒麟系统pom打包

fill-manager/pom.xml

@@ -15,6 +15,13 @@
 	<description>填单系统</description>
 
 	<properties>
+		<!-- 默认值 -->
+		<profiles.server.debug></profiles.server.debug>
+		<profiles.server.port>19211</profiles.server.port>
+		<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>
 	</properties>
 
 	<profiles>
@@ -25,8 +32,6 @@
 			</activation>
 			<properties>
 				<profiles.active>develop</profiles.active>
-				<profiles.server.port>17215</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -36,7 +41,6 @@
 			<id>test</id>
 			<properties>
 				<profiles.active>test</profiles.active>
-				<profiles.server.port>19211</profiles.server.port>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
@@ -47,20 +51,15 @@
 			<id>product</id>
 			<properties>
 				<profiles.active>product</profiles.active>
-				<profiles.server.port>19211</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<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.publish.path>/home/publish</profiles.publish.path>
 			</properties>
 		</profile>
 		<profile>
 			<id>reg</id>
 			<properties>
 				<profiles.active>reg</profiles.active>
-				<profiles.server.port>19211</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<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>
@@ -71,8 +70,6 @@
 			<id>yanyuan</id>
 			<properties>
 				<profiles.active>yanyuan</profiles.active>
-				<profiles.server.port>19211</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<profiles.nacos.server-addr>172.16.30.245:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -83,14 +80,22 @@
 			<id>pengxi</id>
 			<properties>
 				<profiles.active>pengxi</profiles.active>
-				<profiles.server.port>19211</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<profiles.nacos.server-addr>192.168.106.6:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 			</properties>
 		</profile>
 
+		<profile>
+			<id>qiling-test</id>
+			<properties>
+				<profiles.active>qiling-test</profiles.active>
+				<profiles.nacos.server-addr>192.168.0.250:8848</profiles.nacos.server-addr>
+				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+			</properties>
+		</profile>
+
 	</profiles>
 
 	<dependencies>

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

@@ -35,11 +35,18 @@ clear_deploy() {
   SERVICE=$1
   EXECPATH=$2
   #清理后台自启服务
-  rm -rf ${SERVICE}
+  rm -f ${SERVICE}
   #清理执行文件目录
   rm -rf ${EXECPATH}
 }
 
+#清理ui
+clear_ui_deploy() {
+  EXEC_UI_PATH=$1
+  rm -rf ${EXEC_UI_PATH}
+  mkdir -p ${EXEC_UI_PATH}
+}
+
 build_service() {
   SERVICE=$1
   EXECPATH=$2
@@ -51,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}
@@ -66,10 +74,8 @@ start_service() {
   systemctl enable ${PROJECT_NAME}
   systemctl daemon-reload
   writelog "${PROJECT_NAME}服务启动..."
-  systemctl stop ${PROJECT_NAME}
-  sleep 5
-  systemctl start ${PROJECT_NAME}
-  project_status=$(systemctl status "${PROJECT_NAME}" | grep Active | awk '{print $2}')
+  systemctl stop ${PROJECT_NAME} && systemctl start ${PROJECT_NAME}
+  project_status=$(systemctl status "${PROJECT_NAME}"|grep Active |awk '{print $2}')
   jcpid=$(ps -ef | grep -v "grep" | grep "${PROJECT_NAME} " | awk '{print $2}')
   writelog "${PROJECT_NAME}服务启动,PID is ${jcpid} ,status:${project_status}"
 }
@@ -77,7 +83,6 @@ start_service() {
 project_deploy() {
   writelog "${PROJECT_NAME}_deploy"
   systemctl stop ${PROJECT_NAME}
-  sleep 5
   clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   writelog "${PROJECT_NAME}_clear_finish"
   tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
@@ -86,6 +91,15 @@ project_deploy() {
   writelog "${PROJECT_NAME}_deploy_finish"
 }
 
+#部署前台服务
+project_ui_deploy() {
+  writelog "${PROJECT_NAME}_ui_deploy"
+  clear_ui_deploy ${PROJECT_UI_EXECPATH}
+  tar -zvxf ./${PROJECT_UI_FILENAME} -C ${PUBLISH_PATH}
+  writelog "${PROJECT_NAME}_ui_deploy_finish"
+
+}
+
 #主函数
 main() {
   echo "后台服务部署"

fill-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
-if [ ! -n "$PORT" ]; then  
+if [ ! -n "$PORT" ]; then
 	echo $"Usage: $0 {port}"
 	exit $FAIL
 fi
-if [ ! -d $LOG_PATH ]; 
-then     
-    mkdir -p $LOG_PATH; 
+if [ ! -d $LOG_PATH ];
+then
+    mkdir -p $LOG_PATH;
 fi
-if [ ! -d $TEMP_PATH ]; 
-then     
-    mkdir -p $TEMP_PATH; 
+if [ ! -d $TEMP_PATH ];
+then
+    mkdir -p $TEMP_PATH;
 fi
 if [ -z "$JAVACMD" ] ; then
   if [ -n "$JAVA_HOME" ] ; then
@@ -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="-Xms1024M -Xmx2048M -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="-Xms512M -Xmx2048M -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,11 +57,11 @@ 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" \
 				-Djava.io.tmpdir=$TEMP_PATH \
-				-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

fill-manager/src/main/java/com/mortals/xhx/common/utils/WordUtil.java

@@ -88,7 +88,7 @@ public class WordUtil {
             Document doc = new Document(inputFile);
             // 全面支持DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF, EPUB, XPS, SWF 相互转换
             //doc.save(os, SaveFormat.JPEG);
-            ImageSaveOptions options = new ImageSaveOptions(SaveFormat.PNG);
+            ImageSaveOptions options = new ImageSaveOptions(SaveFormat.JPEG);
             options.setResolution(256);
             options.setPrettyFormat(true);
             options.setUseAntiAliasing(true);
@@ -238,9 +238,9 @@ public class WordUtil {
     }
 
     public static void main(String[] args) {
-        String docPath = "E:\\pic\\doc\\2.docx";
+        String docPath = "E:\\pic\\doc\\3.docx";
 
-        String jpgPath = "E:\\pic\\doc\\2.jpg";
+        String jpgPath = "E:\\pic\\doc\\3.jpg";
 
         WordUtil.convertWordToJPEG(docPath, jpgPath);
 /*

fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -30,6 +30,7 @@ import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.baseset.model.BasesetEntity;
 import com.mortals.xhx.module.baseset.model.BasesetQuery;
 import com.mortals.xhx.module.baseset.service.BasesetService;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
 import com.mortals.xhx.module.device.model.DeviceMatterDatumQuery;
 import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
 import com.mortals.xhx.module.home.pdu.HomeQueryPdu;
@@ -312,6 +313,14 @@ public class HomeController extends BaseJsonBodyController {
             int matterCont = matterService.count(matterQuery, this.getContext());
             matterQuery.setIsRecommend(YesNoEnum.YES.getValue());
             List<MatterEntity> matterList = matterService.find(matterQuery, this.getContext());
+
+            matterList= matterList.stream().map(m->{
+                MatterEntity matterEntity = new MatterEntity();
+                matterEntity.setMatterName(m.getMatterName());
+                matterEntity.setId(m.getId());
+                return matterEntity;
+            }).collect(Collectors.toList());
+
             model.put("matterList", matterList);   //热门事项
             model.put("matterCont", matterCont);   //入驻事项数量
             MatterDatumQuery matterDatumQuery = new MatterDatumQuery();
@@ -319,12 +328,14 @@ public class HomeController extends BaseJsonBodyController {
             int datumCont = matterDatumService.count(matterDatumQuery, this.getContext());
             matterDatumQuery.setIsRecommend(YesNoEnum.YES.getValue());
             List<MatterDatumEntity> datumList = matterDatumService.find(matterDatumQuery, this.getContext());
+            for (MatterDatumEntity matterDatumEntity : datumList) {
+                matterDatumEntity.setFormContent("");
+            }
             model.put("datumList", datumList);    //热门表单
             model.put("datumCont", datumCont);    //入驻表单数量
 
-
-            Map<Boolean, List<MatterDatumPrintEntity>> collect = matterDatumPrintService.find(new MatterDatumPrintQuery().siteId(homeQueryPdu.getSiteId()))
-                    .stream().collect(Collectors.partitioningBy(x -> x.getType().equals(1)));
+            List<MatterDatumPrintEntity> matterDatumPrintEntities = matterDatumPrintService.find(new MatterDatumPrintQuery().siteId(homeQueryPdu.getSiteId()));
+            Map<Boolean, List<MatterDatumPrintEntity>> collect = matterDatumPrintEntities.stream().collect(Collectors.partitioningBy(x -> x.getType().equals(1)));
             List<MatterDatumPrintEntity> matterDatumPrintLocalEntities = collect.get(true);
             List<MatterDatumPrintEntity> matterDatumPrintOnlineEntities = collect.get(false);
 
@@ -337,8 +348,9 @@ public class HomeController extends BaseJsonBodyController {
             matterDatumPrintQuery.setCreateTimeEnd(DateUtils.getStrDate(new Date()));
             long todaySum = matterDatumPrintService.find(matterDatumPrintQuery).stream().collect(Collectors.summarizingInt(x -> x.getPrintPage())).getSum();
             model.put("dayThrift", todaySum);      //今日节约
-            long sum = matterDatumPrintOnlineEntities.stream().collect(Collectors.summarizingInt(x -> x.getPrintPage())).getSum();
 
+
+            long sum = matterDatumPrintEntities.stream().collect(Collectors.summarizingInt(x -> x.getPrintPage())).getSum();
             model.put("totalThrift", sum * 2);    //累计节约
             Rest<com.mortals.xhx.common.pdu.site.SitePdu> info = siteFeign.info(homeQueryPdu.getSiteId());
 
@@ -349,6 +361,28 @@ public class HomeController extends BaseJsonBodyController {
             model.put("blankCount", basesetEntity == null ? 20 : basesetEntity.getPrintDisplay()); //空白样表数量
             model.put("newsSource", basesetEntity == null ? 1 : basesetEntity.getNewsSource()); //新闻来源
             model.put("message_info", busiDesc + "成功");
+
+            //添加设备热门事项与热门材料
+
+  /*          if(!ObjectUtils.isEmpty(homeQueryPdu.getDeviceCode())){
+                DeviceMatterDatumQuery deviceMatterDatumQuery = new DeviceMatterDatumQuery();
+                deviceMatterDatumQuery.setDeviceCode(homeQueryPdu.getDeviceCode());
+                deviceMatterDatumQuery.setIsRecommend(YesNoEnum.YES.getValue());
+                deviceMatterDatumQuery.setOrderColList(Arrays.asList(new OrderCol("isRecommend",OrderCol.DESCENDING)));
+                List<DeviceMatterDatumEntity> matterDatumEntityList = deviceMatterDatumService.find(deviceMatterDatumQuery, null);
+                //热门事项取5个
+                List<DeviceMatterDatumEntity> matterEntities = matterDatumEntityList.stream().distinct().limit(5).collect(Collectors.toList());
+                model.put("hotMatterList", matterEntities); //热门事项
+                List<MatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().flatMap(item -> matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId())).stream()).filter(f ->f.getIsRecommend()!=null&& f.getIsRecommend() == YesNoEnum.YES.getValue()).limit(5).map(m->{
+                    m.setFormContent("");
+                    return m;
+                }).collect(Collectors.toList());
+                //热门材料取5个
+                // List<DeviceMatterDatumEntity> matterDatumEntities = matterDatumEntityList.stream().limit(5).collect(Collectors.toList());
+                model.put("hotDatumList", matterDatumEntities); //热门热门材料
+            }*/
+
+
             this.addDict(model, "newsSource", NewsSourceEnum.getEnumMap());
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {
@@ -360,7 +394,7 @@ public class HomeController extends BaseJsonBodyController {
         ret.setData(model);
         ret.setDict(model.get("dict"));
         ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
-      //  log.info("home resp:{}", JSON.toJSONString(ret));
+       // log.info("home resp:{}", JSON.toJSONString(ret));
         return ret;
     }
 
@@ -377,8 +411,6 @@ public class HomeController extends BaseJsonBodyController {
 
         log.info("【应用请求】【请求体】-->serverName{} ,port:{}", serverName, serverPort);
         String appWhiteStr = GlobalSysInfo.getParamValue(Constant.PARAMS_WHITE_APP_LIST, "中心简介,办事指南,意见建议,通知公告");
-
-        log.info("【应用请求】【请求体】-->appWhiteStr{} ", appWhiteStr);
         Set<String> appWhiteSet = StrUtil.split(appWhiteStr, ",").stream().collect(Collectors.toSet());
         Rest<List<AppPdu>> ret = new Rest();
         List<AppPdu> collect = new ArrayList<>();
@@ -389,7 +421,6 @@ public class HomeController extends BaseJsonBodyController {
             appPdu.setSize(-1);
             appPdu.setType(1);
             Rest<RespData<List<AppPdu>>> appRest = appFeign.list(appPdu);
-
             String domainUrl = UrlBuilder.ofHttp(serverName).setPort(serverPort > 0 ? serverPort : 11078).build();
           ///  String domainUrl1 = StrUtil.sub(domainUrl, 0, domainUrl.length());
 
@@ -400,16 +431,16 @@ public class HomeController extends BaseJsonBodyController {
                         .peek(item -> {
                             item.setCustUrl(UrlBuilder.ofHttp(domainUrl).addPath(item.getCustUrl()).build());
                             //item.setAppIconPath(UrlBuilder.ofHttp(domainUrl1).addPath(item.getAppIconPath()).build());
-                          //  log.info(item.getCustUrl());
-                           // log.info(item.getAppIconPath());
+                            log.info(item.getCustUrl());
+                            log.info(item.getAppIconPath());
                         }).collect(Collectors.toList());
             }
         } catch (Exception e) {
-            log.error("异常",e);
             code = VALUE_RESULT_FAILURE;
         }
         ret.setCode(code);
         ret.setData(collect);
+        log.info("【应用请求】【响应体】-->{}", JSONObject.toJSONString(ret));
         return JSONObject.toJSONString(ret);
     }