添加适配直连考勤机定时任务代码

attendance-performance-manager-ui/admin/src/views/door/drawershow.vue

@@ -14,7 +14,15 @@
                             <Field label="端口" prop="port" v-model="form.port" placeholder="请输入端口"/>
                             <Field label="用户名" prop="username" v-model="form.username" placeholder="请输入用户名"/>
                             <Field label="密码" prop="password" v-model="form.password" placeholder="请输入密码"/>
-
+              <Field
+                  label="所属部门"
+                  prop="deptId"
+                  v-model="form.deptId"
+                  type="select"
+                  placeholder="请选择所属部门"
+                  :enumData="dict.deptId"
+                  :disabled="pageInfo.type == 'view'"
+              />
             </el-row>
 
             <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />

attendance-performance-manager/src/main/bin/start.sh

@@ -6,9 +6,9 @@ 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

attendance-performance-manager/src/main/java/com/mortals/xhx/module/door/web/DoorController.java

@@ -3,6 +3,8 @@ package com.mortals.xhx.module.door.web;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.door.model.DoorEntity;
 import com.mortals.xhx.module.door.service.DoorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
 *
@@ -24,6 +27,8 @@ public class DoorController extends BaseCRUDJsonBodyMappingController<DoorServic
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private DeptService deptService;
 
     public DoorController(){
         super.setModuleDesc( "门禁设备");
@@ -32,6 +37,10 @@ public class DoorController extends BaseCRUDJsonBodyMappingController<DoorServic
     @Override
     protected void init(Map<String, Object> model, Context context) {
         super.init(model, context);
+
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
+
+
     }