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

base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppVo.java

@@ -45,4 +45,14 @@ public class AppVo extends BaseEntityLong {
      */
     private String deviceCode;
 
+    /**
+     * 源app
+     */
+    private Long sourceAppId;
+
+    /**
+     * 目标app
+     */
+    private Long targetAppId;
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/service/AppService.java

@@ -27,6 +27,10 @@ public interface AppService extends ICRUDService<AppEntity, Long> {
 
     Rest<String> cloneAppsBySites(List<AppEntity> appList, List<SiteEntity> siteList, Context context);
 
+
+    Rest<String> cloneAppBySameSite(AppEntity appEntity, Context context);
+
+
     AppDao getAppDao();
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java

@@ -168,6 +168,32 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
         return rest;
     }
 
+    /**
+     * app应用克隆给本站点
+     */
+    @PostMapping(value = "cloneAppBySameSite")
+    public Rest<Void> cloneAppBySameSite(@RequestBody AppEntity appQuery) {
+        String busiDesc = this.getModuleDesc() + "自助服务应用部署克隆";
+        Rest<Void> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            if (ObjectUtils.isEmpty(appQuery.getSourceAppId())) {
+                throw new AppException("源appId不能为空！");
+            }
+            if (ObjectUtils.isEmpty(appQuery.getTargetAppId())) {
+                throw new AppException("目标appId不能为空！");
+            }
+            Rest<String> cloneRest = this.service.cloneAppBySameSite(appQuery, getContext());
+            if(YesNoEnum.NO.getValue()==cloneRest.getCode()){
+                return Rest.fail(cloneRest.getMsg());
+            }
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error("应用克隆异常", e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
 
     public static void main(String[] args) {
 

base-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptEntity.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.dept.model;
 import java.util.List;
 import java.util.ArrayList;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.dept.model.vo.DeptVo;
@@ -43,6 +44,7 @@ public class DeptEntity extends DeptVo {
     /**
      * 部门电话
      */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String deptTelphone;
     /**
      * 部门编号
@@ -391,19 +393,19 @@ public class DeptEntity extends DeptVo {
 
         this.tid = null;
 
-        this.tname = null;
+        this.tname = "";
 
-        this.name = null;
+        this.name = "";
 
-        this.simpleName = null;
+        this.simpleName = "";
 
         this.siteId = null;
 
-        this.deptAbb = null;
+        this.deptAbb = "";
 
-        this.deptTelphone = null;
+        this.deptTelphone = "";
 
-        this.deptNumber = null;
+        this.deptNumber = "";
 
         this.isAutotable = 1;