添加窗口导入导出模板

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java

@@ -65,7 +65,7 @@ public class WindowEntity extends WindowVo {
     /**
      * 无人值守(1.是)
      */
-    @Excel(name = "无人值守",combo={"是"}, readConverterExp = "1=是")
+    @Excel(name = "无人值守",combo={"是","否"}, readConverterExp = "1=是,0=否")
     private Integer duty;
     /**
      * 显示内容

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowController.java

@@ -11,10 +11,15 @@ import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.dept.model.DeptEntity;
+import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.site.model.SiteEntity;
+import com.mortals.xhx.module.site.service.SiteService;
 import com.mortals.xhx.module.window.model.WindowEntity;
 import com.mortals.xhx.module.window.service.WindowBusinessService;
 import com.mortals.xhx.module.window.service.WindowService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,10 +43,15 @@ import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
  */
 @RestController
 @RequestMapping("window")
+@Slf4j
 public class WindowController extends BaseCRUDJsonBodyMappingController<WindowService, WindowEntity, Long> {
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private SiteService siteService;
+    @Autowired
+    private DeptService deptService;
 
 
     public WindowController() {
@@ -139,4 +149,37 @@ public class WindowController extends BaseCRUDJsonBodyMappingController<WindowSe
         return ret;
     }
 
+
+    /**
+     * @param list
+     * @param updateSupport
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    public void doImportDataBefore(List<WindowEntity> list, boolean updateSupport, Context context) throws AppException {
+
+        String siteId = request.getParameter("siteId");
+        String deptId = request.getParameter("deptId");
+        log.info("siteId:{}", siteId);
+        SiteEntity siteEntity = null;
+        DeptEntity deptEntity = null;
+        if (!ObjectUtils.isEmpty(siteId)) {
+            siteEntity = siteService.get(Long.parseLong(siteId));
+        }
+
+        if (!ObjectUtils.isEmpty(deptId)) {
+            deptEntity = deptService.get(Long.parseLong(deptId));
+        }
+        for (WindowEntity windowEntity : list) {
+            if (!ObjectUtils.isEmpty(siteEntity)) {
+                windowEntity.setSiteId(siteEntity.getId());
+                windowEntity.setSiteName(siteEntity.getSiteName());
+            }
+            if (!ObjectUtils.isEmpty(deptEntity)) {
+                windowEntity.setDeptId(deptEntity.getId());
+                windowEntity.setDeptName(deptEntity.getName());
+            }
+        }
+    }
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -5,7 +5,7 @@ Content-Type: application/json
 
 {
   "loginName":"admin",
-  "password":"xhx@yb888",
+  "password":"admin",
   "securityCode":"8888"
 }
 

base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http

@@ -68,6 +68,13 @@ Accept: application/json
 GET {{baseUrl}}/window/delete?id={{Window_id}}
 Accept: application/json
 
+###模板导出
+POST {{baseUrl}}/window/downloadTemplate
+Content-Type: application/json
+Authorization: {{authToken}}
+
+
+