Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/pom.xml

@@ -27,7 +27,7 @@
                 <profiles.active>develop</profiles.active>
                 <profiles.server.ip>192.168.0.98</profiles.server.ip>
                 <profiles.server.port>17211</profiles.server.port>
-                <profiles.nginx.port>11072</profiles.nginx.port>
+                <profiles.nginx.port>11071</profiles.nginx.port>
                 <profiles.server.gatewayport>11078</profiles.server.gatewayport>
                 <profiles.server.path>/zwfw</profiles.server.path>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
@@ -51,7 +51,7 @@
                 <profiles.active>test</profiles.active>
                 <profiles.server.ip>192.168.0.98</profiles.server.ip>
                 <profiles.server.port>17211</profiles.server.port>
-                <profiles.nginx.port>11072</profiles.nginx.port>
+                <profiles.nginx.port>11071</profiles.nginx.port>
                 <profiles.server.gatewayport>11078</profiles.server.gatewayport>
                 <profiles.server.path>/base</profiles.server.path>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
@@ -75,7 +75,7 @@
                 <profiles.active>test</profiles.active>
                 <profiles.server.ip>192.168.0.251</profiles.server.ip>
                 <profiles.server.port>17211</profiles.server.port>
-                <profiles.nginx.port>11072</profiles.nginx.port>
+                <profiles.nginx.port>11071</profiles.nginx.port>
                 <profiles.server.gatewayport>11078</profiles.server.gatewayport>
                 <profiles.server.path>/base</profiles.server.path>
                 <profiles.publish.path>/home/publish</profiles.publish.path>

base-manager/src/main/java/com/mortals/xhx/common/code/OnlineEnum.java

@@ -3,27 +3,20 @@ package com.mortals.xhx.common.code;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-/**
-* 是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）枚举类
-*
-* @author zxfei
-*/
+
 public enum OnlineEnum {
-    离线(0, "离线"),
-    在线(1, "在线"),
-    暂离(2, "暂离"),
-    点击暂离(3, "点击暂离"),
-    回归(4, "回归"),
-    登陆(5, "登陆");
-    private Integer value;
+    在线("zx", "在线"),
+    离线("lx", "离线"),
+    暂离("zl", "暂离");
+    private String value;
     private String desc;
 
-    OnlineEnum(Integer value, String desc) {
+    OnlineEnum(String value, String desc) {
         this.value = value;
         this.desc = desc;
     }
 
-    public Integer getValue() {
+    public String getValue() {
         return this.value;
     }
 
@@ -31,7 +24,7 @@ public enum OnlineEnum {
         return this.desc;
     }
 
-    public static OnlineEnum getByValue(Integer value) {
+    public static OnlineEnum getByValue(String value) {
         for (OnlineEnum onlineEnum : OnlineEnum.values()) {
             if (onlineEnum.getValue() == value) {
                 return onlineEnum;
@@ -46,12 +39,12 @@ public enum OnlineEnum {
     * @param eItem 不包含项
     * @return
     */
-    public static Map<String, String> getEnumMap(Integer... eItem) {
+    public static Map<String, String> getEnumMap(String... eItem) {
         Map<String, String> resultMap = new LinkedHashMap<>();
         for (OnlineEnum item : OnlineEnum.values()) {
             try {
                 boolean hasE = false;
-                for (Integer e : eItem) {
+                for (String e : eItem) {
                     if (item.getValue() == e) {
                         hasE = true;
                         break;

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeMatterThread.java

 package com.mortals.xhx.common.utils;
 
-import com.alibaba.fastjson.JSON;
-import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.matter.service.MatterService;
-import com.mortals.xhx.module.site.model.SiteTreeSelect;
-import com.mortals.xhx.module.site.service.SiteService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.List;
-
 /**
  * 同步基础事项数据
  *

base-manager/src/main/java/com/mortals/xhx/module/matters/model/MattersDeptEntity.java

 package com.mortals.xhx.module.matters.model;
 
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
+
 import com.mortals.xhx.module.matters.model.vo.MattersDeptVo;
 /**
 * 部门实体对象

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -17,6 +17,7 @@ import com.mortals.xhx.base.system.role.service.RoleUserService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.common.code.OnlineEnum;
 import com.mortals.xhx.module.model.model.ModelQuery;
 import com.mortals.xhx.module.model.service.ModelService;
 import com.mortals.xhx.module.workman.model.WorkmanEntity;
@@ -53,7 +54,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         this.addDict(model, "politicalstatus", paramService.getParamBySecondOrganize("Workman", "politicalstatus"));
         this.addDict(model, "dangyuan", paramService.getParamBySecondOrganize("Workman", "dangyuan"));
         this.addDict(model, "starlevel", paramService.getParamBySecondOrganize("Workman", "starlevel"));
-        this.addDict(model, "online", paramService.getParamBySecondOrganize("Workman", "online"));
+        this.addDict(model, "online", OnlineEnum.getEnumMap());
 
         super.init(model, context);
     }