Browse Source

代码提交

xiao547607 4 years ago
parent
commit
7f01af0dc1
37 changed files with 3002 additions and 7 deletions
  1. 20 0
      common/src/main/java/com/jpsoft/employment/modules/manage/dao/DeviceConfigurationDAO.java
  2. 19 0
      common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairAdmissionDAO.java
  3. 19 0
      common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairCompanyDAO.java
  4. 19 0
      common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairDAO.java
  5. 19 0
      common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairDeliverRecordDAO.java
  6. 19 0
      common/src/main/java/com/jpsoft/employment/modules/manage/dao/SeatManageDAO.java
  7. 51 0
      common/src/main/java/com/jpsoft/employment/modules/manage/entity/DeviceConfiguration.java
  8. 55 0
      common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFair.java
  9. 49 0
      common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFairAdmission.java
  10. 47 0
      common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFairCompany.java
  11. 41 0
      common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFairDeliverRecord.java
  12. 49 0
      common/src/main/java/com/jpsoft/employment/modules/manage/entity/SeatManage.java
  13. 18 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/DeviceConfigurationService.java
  14. 17 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairAdmissionService.java
  15. 17 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairCompanyService.java
  16. 17 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairDeliverRecordService.java
  17. 17 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairService.java
  18. 17 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/SeatManageService.java
  19. 71 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/DeviceConfigurationServiceImpl.java
  20. 71 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairAdmissionServiceImpl.java
  21. 71 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairCompanyServiceImpl.java
  22. 71 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairDeliverRecordServiceImpl.java
  23. 71 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairServiceImpl.java
  24. 71 0
      common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/SeatManageServiceImpl.java
  25. 121 0
      common/src/main/resources/mapper/manage/DeviceConfiguration.xml
  26. 126 0
      common/src/main/resources/mapper/manage/JobFair.xml
  27. 116 0
      common/src/main/resources/mapper/manage/JobFairAdmission.xml
  28. 111 0
      common/src/main/resources/mapper/manage/JobFairCompany.xml
  29. 96 0
      common/src/main/resources/mapper/manage/JobFairDeliverRecord.xml
  30. 117 0
      common/src/main/resources/mapper/manage/SeatManage.xml
  31. 225 0
      web/src/main/java/com/jpsoft/employment/modules/manage/controller/DeviceConfigurationController.java
  32. 225 0
      web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairAdmissionController.java
  33. 225 0
      web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairCompanyController.java
  34. 248 0
      web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairController.java
  35. 225 0
      web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairDeliverRecordController.java
  36. 225 0
      web/src/main/java/com/jpsoft/employment/modules/manage/controller/SeatManageController.java
  37. 6 7
      web/src/main/resources/application-dev.yml

+ 20 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/dao/DeviceConfigurationDAO.java

@@ -0,0 +1,20 @@
+package com.jpsoft.employment.modules.manage.dao;
+
+import java.util.List;
+
+import com.jpsoft.employment.modules.manage.entity.DeviceConfiguration;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface DeviceConfigurationDAO {
+	int insert(DeviceConfiguration entity);
+	int update(DeviceConfiguration entity);
+	int exist(String id);
+	DeviceConfiguration get(String id);
+	int delete(String id);
+	List<DeviceConfiguration> list();
+	List<DeviceConfiguration> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

+ 19 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairAdmissionDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.manage.dao;
+
+import java.util.List;
+
+import com.jpsoft.employment.modules.manage.entity.JobFairAdmission;
+import org.springframework.stereotype.Repository;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface JobFairAdmissionDAO {
+	int insert(JobFairAdmission entity);
+	int update(JobFairAdmission entity);
+	int exist(String id);
+	JobFairAdmission get(String id);
+	int delete(String id);
+	List<JobFairAdmission> list();
+	List<JobFairAdmission> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

+ 19 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairCompanyDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.manage.dao;
+
+import java.util.List;
+
+import com.jpsoft.employment.modules.manage.entity.JobFairCompany;
+import org.springframework.stereotype.Repository;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface JobFairCompanyDAO {
+	int insert(JobFairCompany entity);
+	int update(JobFairCompany entity);
+	int exist(String id);
+	JobFairCompany get(String id);
+	int delete(String id);
+	List<JobFairCompany> list();
+	List<JobFairCompany> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

+ 19 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.manage.dao;
+
+import java.util.List;
+
+import com.jpsoft.employment.modules.manage.entity.JobFair;
+import org.springframework.stereotype.Repository;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface JobFairDAO {
+	int insert(JobFair entity);
+	int update(JobFair entity);
+	int exist(String id);
+	JobFair get(String id);
+	int delete(String id);
+	List<JobFair> list();
+	List<JobFair> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

+ 19 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/dao/JobFairDeliverRecordDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.manage.dao;
+
+import java.util.List;
+
+import com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord;
+import org.springframework.stereotype.Repository;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface JobFairDeliverRecordDAO {
+	int insert(JobFairDeliverRecord entity);
+	int update(JobFairDeliverRecord entity);
+	int exist(String id);
+	JobFairDeliverRecord get(String id);
+	int delete(String id);
+	List<JobFairDeliverRecord> list();
+	List<JobFairDeliverRecord> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

+ 19 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/dao/SeatManageDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.manage.dao;
+
+import java.util.List;
+
+import com.jpsoft.employment.modules.manage.entity.SeatManage;
+import org.springframework.stereotype.Repository;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface SeatManageDAO {
+	int insert(SeatManage entity);
+	int update(SeatManage entity);
+	int exist(String id);
+	SeatManage get(String id);
+	int delete(String id);
+	List<SeatManage> list();
+	List<SeatManage> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

+ 51 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/entity/DeviceConfiguration.java

@@ -0,0 +1,51 @@
+package com.jpsoft.employment.modules.manage.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:manage_device_configuration的实体类
+ */
+@Data
+@ApiModel(value = "manage_device_configuration的实体类")
+public class DeviceConfiguration {
+        @ApiModelProperty(value = "")
+    private String id;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date createTime;
+        @ApiModelProperty(value = "")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date updateTime;
+        @ApiModelProperty(value = "")
+    private String updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "大门欢迎语")
+    private String dmWelcomeWords;
+        @ApiModelProperty(value = "当前招聘会ID")
+    private String jobFairId;
+        @ApiModelProperty(value = "大厅模板(字典表,欢迎语1,可视化2,数据统计3)")
+    private String dtTemplate;
+        @ApiModelProperty(value = "大厅欢迎语")
+    private String dtWelcomeWords;
+        @ApiModelProperty(value = "大厅背景图")
+    private String dtImgUrl;
+        @ApiModelProperty(value = "大厅数据统计模板(字典表)")
+    private String dtDataTemplate;
+        @ApiModelProperty(value = "席位欢迎语")
+    private String xwWelcomeWords;
+        @ApiModelProperty(value = "席位背景图")
+    private String xwImgUrl;
+}

+ 55 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFair.java

@@ -0,0 +1,55 @@
+package com.jpsoft.employment.modules.manage.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:manage_job_fair的实体类
+ */
+@Data
+@ApiModel(value = "manage_job_fair的实体类")
+public class JobFair {
+        @ApiModelProperty(value = "")
+    private String id;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date createTime;
+        @ApiModelProperty(value = "")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date updateTime;
+        @ApiModelProperty(value = "")
+    private String updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "招聘会名称")
+    private String name;
+        @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+        @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+        @ApiModelProperty(value = "入场时间段")
+    private String admissionPeriod;
+        @ApiModelProperty(value = "简介")
+    private String introduce;
+        @ApiModelProperty(value = "宣传图片")
+    private String imgUrls;
+        @ApiModelProperty(value = "视频地址")
+    private String videoUrl;
+    @ApiModelProperty(value = "招聘会状态")
+    private String status;
+}

+ 49 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFairAdmission.java

@@ -0,0 +1,49 @@
+package com.jpsoft.employment.modules.manage.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:manage_job_fair_admission的实体类
+ */
+@Data
+@ApiModel(value = "manage_job_fair_admission的实体类")
+public class JobFairAdmission {
+        @ApiModelProperty(value = "")
+    private String id;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date createTime;
+        @ApiModelProperty(value = "")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date updateTime;
+        @ApiModelProperty(value = "")
+    private String updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "招聘会ID")
+    private String jobFairId;
+        @ApiModelProperty(value = "用户ID(无则没有)")
+    private String jobUserId;
+        @ApiModelProperty(value = "姓名")
+    private String name;
+        @ApiModelProperty(value = "电话")
+    private String tel;
+        @ApiModelProperty(value = "身份证")
+    private String idCard;
+        @ApiModelProperty(value = "简历ID")
+    private String resumeId;
+        @ApiModelProperty(value = "人员状态")
+    private String type;
+}

+ 47 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFairCompany.java

@@ -0,0 +1,47 @@
+package com.jpsoft.employment.modules.manage.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:manage_job_fair_company的实体类
+ */
+@Data
+@ApiModel(value = "manage_job_fair_company的实体类")
+public class JobFairCompany {
+        @ApiModelProperty(value = "")
+    private String id;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date createTime;
+        @ApiModelProperty(value = "")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date updateTime;
+        @ApiModelProperty(value = "")
+    private String updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "招聘会ID")
+    private String jobFairId;
+        @ApiModelProperty(value = "企业ID")
+    private String companyId;
+        @ApiModelProperty(value = "开放的职位ID")
+    private String recruitmentIds;
+        @ApiModelProperty(value = "招聘人数")
+    private Integer num;
+        @ApiModelProperty(value = "联系人")
+    private String contactPerson;
+        @ApiModelProperty(value = "联系方式")
+    private String tel;
+}

+ 41 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/entity/JobFairDeliverRecord.java

@@ -0,0 +1,41 @@
+package com.jpsoft.employment.modules.manage.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:manage_job_fair_deliver_record的实体类
+ */
+@Data
+@ApiModel(value = "manage_job_fair_deliver_record的实体类")
+public class JobFairDeliverRecord {
+        @ApiModelProperty(value = "")
+    private String id;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date createTime;
+        @ApiModelProperty(value = "")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date updateTime;
+        @ApiModelProperty(value = "")
+    private String updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "招聘会ID")
+    private String jobFairId;
+        @ApiModelProperty(value = "简历ID")
+    private String resumeId;
+        @ApiModelProperty(value = "职位ID")
+    private String recruitmentId;
+}

+ 49 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/entity/SeatManage.java

@@ -0,0 +1,49 @@
+package com.jpsoft.employment.modules.manage.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:manage_seat_manage的实体类
+ */
+@Data
+@ApiModel(value = "manage_seat_manage的实体类")
+public class SeatManage {
+        @ApiModelProperty(value = "")
+    private String id;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date createTime;
+        @ApiModelProperty(value = "")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "")
+    private Date updateTime;
+        @ApiModelProperty(value = "")
+    private String updateBy;
+        @ApiModelProperty(value = "")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "席位编号")
+    private String seatNum;
+        @ApiModelProperty(value = "显示模板")
+    private String template;
+        @ApiModelProperty(value = "企业ID")
+    private String companyId;
+        @ApiModelProperty(value = "介绍")
+    private String introduce;
+        @ApiModelProperty(value = "图片地址")
+    private String imgUrls;
+        @ApiModelProperty(value = "图片地址")
+    private String videoUrl;
+    @ApiModelProperty(value = "状态")
+    private String status;
+}

+ 18 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/DeviceConfigurationService.java

@@ -0,0 +1,18 @@
+package com.jpsoft.employment.modules.manage.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.manage.entity.DeviceConfiguration;
+
+public interface DeviceConfigurationService {
+	DeviceConfiguration get(String id);
+	boolean exist(String id);
+	int insert(DeviceConfiguration model);
+	int update(DeviceConfiguration model);
+	int delete(String id);
+	List<DeviceConfiguration> list();
+	Page<DeviceConfiguration> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

+ 17 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairAdmissionService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.manage.service;
+
+import java.util.List;
+import java.util.Map;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.manage.entity.JobFairAdmission;
+
+public interface JobFairAdmissionService {
+	JobFairAdmission get(String id);
+	boolean exist(String id);
+	int insert(JobFairAdmission model);
+	int update(JobFairAdmission model);
+	int delete(String id);
+	List<JobFairAdmission> list();
+	Page<JobFairAdmission> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

+ 17 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairCompanyService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.manage.service;
+
+import java.util.List;
+import java.util.Map;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.manage.entity.JobFairCompany;
+
+public interface JobFairCompanyService {
+	JobFairCompany get(String id);
+	boolean exist(String id);
+	int insert(JobFairCompany model);
+	int update(JobFairCompany model);
+	int delete(String id);
+	List<JobFairCompany> list();
+	Page<JobFairCompany> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

+ 17 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairDeliverRecordService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.manage.service;
+
+import java.util.List;
+import java.util.Map;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord;
+
+public interface JobFairDeliverRecordService {
+	JobFairDeliverRecord get(String id);
+	boolean exist(String id);
+	int insert(JobFairDeliverRecord model);
+	int update(JobFairDeliverRecord model);
+	int delete(String id);
+	List<JobFairDeliverRecord> list();
+	Page<JobFairDeliverRecord> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

+ 17 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/JobFairService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.manage.service;
+
+import java.util.List;
+import java.util.Map;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.manage.entity.JobFair;
+
+public interface JobFairService {
+	JobFair get(String id);
+	boolean exist(String id);
+	int insert(JobFair model);
+	int update(JobFair model);
+	int delete(String id);
+	List<JobFair> list();
+	Page<JobFair> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

+ 17 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/SeatManageService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.employment.modules.manage.service;
+
+import java.util.List;
+import java.util.Map;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.manage.entity.SeatManage;
+
+public interface SeatManageService {
+	SeatManage get(String id);
+	boolean exist(String id);
+	int insert(SeatManage model);
+	int update(SeatManage model);
+	int delete(String id);
+	List<SeatManage> list();
+	Page<SeatManage> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

+ 71 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/DeviceConfigurationServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.DeviceConfigurationDAO;
+import com.jpsoft.employment.modules.manage.entity.DeviceConfiguration;
+import com.jpsoft.employment.modules.manage.service.DeviceConfigurationService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="deviceConfigurationService")
+public class DeviceConfigurationServiceImpl implements DeviceConfigurationService {
+	@Resource(name="deviceConfigurationDAO")
+	private DeviceConfigurationDAO deviceConfigurationDAO;
+
+	@Override
+	public DeviceConfiguration get(String id) {
+		// TODO Auto-generated method stub
+		return deviceConfigurationDAO.get(id);
+	}
+
+	@Override
+	public int insert(DeviceConfiguration model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return deviceConfigurationDAO.insert(model);
+	}
+
+	@Override
+	public int update(DeviceConfiguration model) {
+		// TODO Auto-generated method stub
+		return deviceConfigurationDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return deviceConfigurationDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = deviceConfigurationDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<DeviceConfiguration> list() {
+		// TODO Auto-generated method stub
+		return deviceConfigurationDAO.list();
+	}
+		
+	@Override
+	public Page<DeviceConfiguration> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<DeviceConfiguration> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            deviceConfigurationDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 71 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairAdmissionServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.JobFairAdmissionDAO;
+import com.jpsoft.employment.modules.manage.entity.JobFairAdmission;
+import com.jpsoft.employment.modules.manage.service.JobFairAdmissionService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="jobFairAdmissionService")
+public class JobFairAdmissionServiceImpl implements JobFairAdmissionService {
+	@Resource(name="jobFairAdmissionDAO")
+	private JobFairAdmissionDAO jobFairAdmissionDAO;
+
+	@Override
+	public JobFairAdmission get(String id) {
+		// TODO Auto-generated method stub
+		return jobFairAdmissionDAO.get(id);
+	}
+
+	@Override
+	public int insert(JobFairAdmission model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return jobFairAdmissionDAO.insert(model);
+	}
+
+	@Override
+	public int update(JobFairAdmission model) {
+		// TODO Auto-generated method stub
+		return jobFairAdmissionDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return jobFairAdmissionDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = jobFairAdmissionDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<JobFairAdmission> list() {
+		// TODO Auto-generated method stub
+		return jobFairAdmissionDAO.list();
+	}
+		
+	@Override
+	public Page<JobFairAdmission> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<JobFairAdmission> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            jobFairAdmissionDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 71 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairCompanyServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.JobFairCompanyDAO;
+import com.jpsoft.employment.modules.manage.entity.JobFairCompany;
+import com.jpsoft.employment.modules.manage.service.JobFairCompanyService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="jobFairCompanyService")
+public class JobFairCompanyServiceImpl implements JobFairCompanyService {
+	@Resource(name="jobFairCompanyDAO")
+	private JobFairCompanyDAO jobFairCompanyDAO;
+
+	@Override
+	public JobFairCompany get(String id) {
+		// TODO Auto-generated method stub
+		return jobFairCompanyDAO.get(id);
+	}
+
+	@Override
+	public int insert(JobFairCompany model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return jobFairCompanyDAO.insert(model);
+	}
+
+	@Override
+	public int update(JobFairCompany model) {
+		// TODO Auto-generated method stub
+		return jobFairCompanyDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return jobFairCompanyDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = jobFairCompanyDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<JobFairCompany> list() {
+		// TODO Auto-generated method stub
+		return jobFairCompanyDAO.list();
+	}
+		
+	@Override
+	public Page<JobFairCompany> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<JobFairCompany> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            jobFairCompanyDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 71 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairDeliverRecordServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.JobFairDeliverRecordDAO;
+import com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord;
+import com.jpsoft.employment.modules.manage.service.JobFairDeliverRecordService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="jobFairDeliverRecordService")
+public class JobFairDeliverRecordServiceImpl implements JobFairDeliverRecordService {
+	@Resource(name="jobFairDeliverRecordDAO")
+	private JobFairDeliverRecordDAO jobFairDeliverRecordDAO;
+
+	@Override
+	public JobFairDeliverRecord get(String id) {
+		// TODO Auto-generated method stub
+		return jobFairDeliverRecordDAO.get(id);
+	}
+
+	@Override
+	public int insert(JobFairDeliverRecord model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return jobFairDeliverRecordDAO.insert(model);
+	}
+
+	@Override
+	public int update(JobFairDeliverRecord model) {
+		// TODO Auto-generated method stub
+		return jobFairDeliverRecordDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return jobFairDeliverRecordDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = jobFairDeliverRecordDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<JobFairDeliverRecord> list() {
+		// TODO Auto-generated method stub
+		return jobFairDeliverRecordDAO.list();
+	}
+		
+	@Override
+	public Page<JobFairDeliverRecord> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<JobFairDeliverRecord> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            jobFairDeliverRecordDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 71 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/JobFairServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.JobFairDAO;
+import com.jpsoft.employment.modules.manage.entity.JobFair;
+import com.jpsoft.employment.modules.manage.service.JobFairService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="jobFairService")
+public class JobFairServiceImpl implements JobFairService {
+	@Resource(name="jobFairDAO")
+	private JobFairDAO jobFairDAO;
+
+	@Override
+	public JobFair get(String id) {
+		// TODO Auto-generated method stub
+		return jobFairDAO.get(id);
+	}
+
+	@Override
+	public int insert(JobFair model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return jobFairDAO.insert(model);
+	}
+
+	@Override
+	public int update(JobFair model) {
+		// TODO Auto-generated method stub
+		return jobFairDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return jobFairDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = jobFairDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<JobFair> list() {
+		// TODO Auto-generated method stub
+		return jobFairDAO.list();
+	}
+		
+	@Override
+	public Page<JobFair> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<JobFair> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            jobFairDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 71 - 0
common/src/main/java/com/jpsoft/employment/modules/manage/service/impl/SeatManageServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.employment.modules.manage.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.manage.dao.SeatManageDAO;
+import com.jpsoft.employment.modules.manage.entity.SeatManage;
+import com.jpsoft.employment.modules.manage.service.SeatManageService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="seatManageService")
+public class SeatManageServiceImpl implements SeatManageService {
+	@Resource(name="seatManageDAO")
+	private SeatManageDAO seatManageDAO;
+
+	@Override
+	public SeatManage get(String id) {
+		// TODO Auto-generated method stub
+		return seatManageDAO.get(id);
+	}
+
+	@Override
+	public int insert(SeatManage model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return seatManageDAO.insert(model);
+	}
+
+	@Override
+	public int update(SeatManage model) {
+		// TODO Auto-generated method stub
+		return seatManageDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return seatManageDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = seatManageDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<SeatManage> list() {
+		// TODO Auto-generated method stub
+		return seatManageDAO.list();
+	}
+		
+	@Override
+	public Page<SeatManage> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<SeatManage> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            seatManageDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 121 - 0
common/src/main/resources/mapper/manage/DeviceConfiguration.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.DeviceConfigurationDAO">
+	<resultMap id="DeviceConfigurationMap" type="com.jpsoft.employment.modules.manage.entity.DeviceConfiguration">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="dmWelcomeWords" column="dm_welcome_words" />
+			<result property="jobFairId" column="job_fair_id" />
+			<result property="dtTemplate" column="dt_template" />
+			<result property="dtWelcomeWords" column="dt__welcome_words" />
+			<result property="dtImgUrl" column="dt_img_url" />
+			<result property="dtDataTemplate" column="dt_data_template" />
+			<result property="xwWelcomeWords" column="xw_welcome_words" />
+			<result property="xwImgUrl" column="xw_img_url" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.DeviceConfiguration">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_device_configuration
+	    (id_,create_time,create_by,update_time,update_by,del_flag,dm_welcome_words,job_fair_id,dt_template,dt__welcome_words,dt_img_url,dt_data_template,xw_welcome_words,xw_img_url)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{dmWelcomeWords,jdbcType= NUMERIC }
+,#{jobFairId,jdbcType=VARCHAR}
+,#{dtTemplate,jdbcType=VARCHAR}
+,#{dtWelcomeWords,jdbcType= NUMERIC }
+,#{dtImgUrl,jdbcType=VARCHAR}
+,#{dtDataTemplate,jdbcType=VARCHAR}
+,#{xwWelcomeWords,jdbcType= NUMERIC }
+,#{xwImgUrl,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_device_configuration where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.DeviceConfiguration">
+		update manage_device_configuration
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="dmWelcomeWords!=null">
+		dm_welcome_words=#{dmWelcomeWords,jdbcType= NUMERIC },
+		</if>
+				<if test="jobFairId!=null">
+		job_fair_id=#{jobFairId,jdbcType=VARCHAR},
+		</if>
+				<if test="dtTemplate!=null">
+		dt_template=#{dtTemplate,jdbcType=VARCHAR},
+		</if>
+				<if test="dtWelcomeWords!=null">
+		dt__welcome_words=#{dtWelcomeWords,jdbcType= NUMERIC },
+		</if>
+				<if test="dtImgUrl!=null">
+		dt_img_url=#{dtImgUrl,jdbcType=VARCHAR},
+		</if>
+				<if test="dtDataTemplate!=null">
+		dt_data_template=#{dtDataTemplate,jdbcType=VARCHAR},
+		</if>
+				<if test="xwWelcomeWords!=null">
+		xw_welcome_words=#{xwWelcomeWords,jdbcType= NUMERIC },
+		</if>
+				<if test="xwImgUrl!=null">
+		xw_img_url=#{xwImgUrl,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="DeviceConfigurationMap">
+		select * from manage_device_configuration where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_device_configuration where id_=#{0}
+	</select>
+	<select id="list" resultMap="DeviceConfigurationMap">
+		select * from manage_device_configuration
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="DeviceConfigurationMap">
+		<![CDATA[
+			select * from manage_device_configuration
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 126 - 0
common/src/main/resources/mapper/manage/JobFair.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.JobFairDAO">
+	<resultMap id="JobFairMap" type="com.jpsoft.employment.modules.manage.entity.JobFair">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="name" column="name_" />
+			<result property="startTime" column="start_time" />
+			<result property="endTime" column="end_time" />
+			<result property="admissionPeriod" column="admission_period" />
+			<result property="introduce" column="introduce_" />
+			<result property="imgUrls" column="img_urls" />
+			<result property="videoUrl" column="video_url" />
+			<result property="status" column="status_" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.JobFair">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_job_fair
+	    (id_,create_time,create_by,update_time,update_by,del_flag,name_,start_time,end_time,admission_period,introduce_,img_urls,video_url,status_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{name,jdbcType=VARCHAR}
+,#{startTime,jdbcType= TIMESTAMP }
+,#{endTime,jdbcType= TIMESTAMP }
+,#{admissionPeriod,jdbcType=VARCHAR}
+,#{introduce,jdbcType= NUMERIC }
+,#{imgUrls,jdbcType= NUMERIC }
+,#{videoUrl,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_job_fair where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.JobFair">
+		update manage_job_fair
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="startTime!=null">
+		start_time=#{startTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="endTime!=null">
+		end_time=#{endTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="admissionPeriod!=null">
+		admission_period=#{admissionPeriod,jdbcType=VARCHAR},
+		</if>
+				<if test="introduce!=null">
+		introduce_=#{introduce,jdbcType= NUMERIC },
+		</if>
+				<if test="imgUrls!=null">
+		img_urls=#{imgUrls,jdbcType= NUMERIC },
+		</if>
+				<if test="videoUrl!=null">
+		video_url=#{videoUrl,jdbcType=VARCHAR},
+		</if>
+			<if test="status!=null">
+				status_=#{status,jdbcType=VARCHAR},
+			</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="JobFairMap">
+		select * from manage_job_fair where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_job_fair where id_=#{0}
+	</select>
+	<select id="list" resultMap="JobFairMap">
+		select * from manage_job_fair
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="JobFairMap">
+		<![CDATA[
+			select * from manage_job_fair
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+			<if test="searchParams.nowDate != null">
+				<![CDATA[
+				and start_time >= #{searchParams.nowDate}
+				]]>
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 116 - 0
common/src/main/resources/mapper/manage/JobFairAdmission.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.JobFairAdmissionDAO">
+	<resultMap id="JobFairAdmissionMap" type="com.jpsoft.employment.modules.manage.entity.JobFairAdmission">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="jobFairId" column="job_fair_id" />
+			<result property="jobUserId" column="job_user_id" />
+			<result property="name" column="name_" />
+			<result property="tel" column="tel_" />
+			<result property="idCard" column="id_card" />
+			<result property="resumeId" column="resume_id" />
+			<result property="type" column="type_" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairAdmission">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_job_fair_admission
+	    (id_,create_time,create_by,update_time,update_by,del_flag,job_fair_id,job_user_id,name_,tel_,id_card,resume_id,type_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{jobFairId,jdbcType=VARCHAR}
+,#{jobUserId,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{tel,jdbcType=VARCHAR}
+,#{idCard,jdbcType=VARCHAR}
+,#{resumeId,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_job_fair_admission where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairAdmission">
+		update manage_job_fair_admission
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="jobFairId!=null">
+		job_fair_id=#{jobFairId,jdbcType=VARCHAR},
+		</if>
+				<if test="jobUserId!=null">
+		job_user_id=#{jobUserId,jdbcType=VARCHAR},
+		</if>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="tel!=null">
+		tel_=#{tel,jdbcType=VARCHAR},
+		</if>
+				<if test="idCard!=null">
+		id_card=#{idCard,jdbcType=VARCHAR},
+		</if>
+				<if test="resumeId!=null">
+		resume_id=#{resumeId,jdbcType=VARCHAR},
+		</if>
+				<if test="type!=null">
+		type_=#{type,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="JobFairAdmissionMap">
+		select * from manage_job_fair_admission where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_job_fair_admission where id_=#{0}
+	</select>
+	<select id="list" resultMap="JobFairAdmissionMap">
+		select * from manage_job_fair_admission
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="JobFairAdmissionMap">
+		<![CDATA[
+			select * from manage_job_fair_admission
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 111 - 0
common/src/main/resources/mapper/manage/JobFairCompany.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.JobFairCompanyDAO">
+	<resultMap id="JobFairCompanyMap" type="com.jpsoft.employment.modules.manage.entity.JobFairCompany">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="jobFairId" column="job_fair_id" />
+			<result property="companyId" column="company_id" />
+			<result property="recruitmentIds" column="recruitment_ids" />
+			<result property="num" column="num_" />
+			<result property="contactPerson" column="contact_person" />
+			<result property="tel" column="tel_" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairCompany">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_job_fair_company
+	    (id_,create_time,create_by,update_time,update_by,del_flag,job_fair_id,company_id,recruitment_ids,num_,contact_person,tel_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{jobFairId,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{recruitmentIds,jdbcType= NUMERIC }
+,#{num,jdbcType= NUMERIC }
+,#{contactPerson,jdbcType=VARCHAR}
+,#{tel,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_job_fair_company where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairCompany">
+		update manage_job_fair_company
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="jobFairId!=null">
+		job_fair_id=#{jobFairId,jdbcType=VARCHAR},
+		</if>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="recruitmentIds!=null">
+		recruitment_ids=#{recruitmentIds,jdbcType= NUMERIC },
+		</if>
+				<if test="num!=null">
+		num_=#{num,jdbcType= NUMERIC },
+		</if>
+				<if test="contactPerson!=null">
+		contact_person=#{contactPerson,jdbcType=VARCHAR},
+		</if>
+				<if test="tel!=null">
+		tel_=#{tel,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="JobFairCompanyMap">
+		select * from manage_job_fair_company where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_job_fair_company where id_=#{0}
+	</select>
+	<select id="list" resultMap="JobFairCompanyMap">
+		select * from manage_job_fair_company
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="JobFairCompanyMap">
+		<![CDATA[
+			select * from manage_job_fair_company
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 96 - 0
common/src/main/resources/mapper/manage/JobFairDeliverRecord.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.JobFairDeliverRecordDAO">
+	<resultMap id="JobFairDeliverRecordMap" type="com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="jobFairId" column="job_fair_id" />
+			<result property="resumeId" column="resume_id" />
+			<result property="recruitmentId" column="recruitment_id" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_job_fair_deliver_record
+	    (id_,create_time,create_by,update_time,update_by,del_flag,job_fair_id,resume_id,recruitment_id)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{jobFairId,jdbcType=VARCHAR}
+,#{resumeId,jdbcType=VARCHAR}
+,#{recruitmentId,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_job_fair_deliver_record where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord">
+		update manage_job_fair_deliver_record
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="jobFairId!=null">
+		job_fair_id=#{jobFairId,jdbcType=VARCHAR},
+		</if>
+				<if test="resumeId!=null">
+		resume_id=#{resumeId,jdbcType=VARCHAR},
+		</if>
+				<if test="recruitmentId!=null">
+		recruitment_id=#{recruitmentId,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="JobFairDeliverRecordMap">
+		select * from manage_job_fair_deliver_record where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_job_fair_deliver_record where id_=#{0}
+	</select>
+	<select id="list" resultMap="JobFairDeliverRecordMap">
+		select * from manage_job_fair_deliver_record
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="JobFairDeliverRecordMap">
+		<![CDATA[
+			select * from manage_job_fair_deliver_record
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 117 - 0
common/src/main/resources/mapper/manage/SeatManage.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.manage.dao.SeatManageDAO">
+	<resultMap id="SeatManageMap" type="com.jpsoft.employment.modules.manage.entity.SeatManage">
+		<id property="id" column="id_" />
+			<result property="createTime" column="create_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			<result property="seatNum" column="seat_num" />
+			<result property="template" column="template_" />
+			<result property="companyId" column="company_id" />
+			<result property="introduce" column="introduce_" />
+			<result property="imgUrls" column="img_urls" />
+			<result property="videoUrl" column="video_url" />
+			<result property="status" column="status_" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.manage.entity.SeatManage">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into manage_seat_manage
+	    (id_,create_time,create_by,update_time,update_by,del_flag,seat_num,template_,company_id,introduce_,img_urls,video_url,
+	    status_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{seatNum,jdbcType=VARCHAR}
+,#{template,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{introduce,jdbcType= NUMERIC }
+,#{imgUrls,jdbcType= NUMERIC }
+,#{videoUrl,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from manage_seat_manage where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.manage.entity.SeatManage">
+		update manage_seat_manage
+		<set>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="seatNum!=null">
+		seat_num=#{seatNum,jdbcType=VARCHAR},
+		</if>
+				<if test="template!=null">
+		template_=#{template,jdbcType=VARCHAR},
+		</if>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="introduce!=null">
+		introduce_=#{introduce,jdbcType= NUMERIC },
+		</if>
+				<if test="imgUrls!=null">
+		img_urls=#{imgUrls,jdbcType= NUMERIC },
+		</if>
+				<if test="videoUrl!=null">
+		video_url=#{videoUrl,jdbcType=VARCHAR},
+		</if>
+			<if test="status!=null">
+				status_=#{status,jdbcType=VARCHAR},
+			</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="SeatManageMap">
+		select * from manage_seat_manage where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from manage_seat_manage where id_=#{0}
+	</select>
+	<select id="list" resultMap="SeatManageMap">
+		select * from manage_seat_manage
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="SeatManageMap">
+		<![CDATA[
+			select * from manage_seat_manage
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 225 - 0
web/src/main/java/com/jpsoft/employment/modules/manage/controller/DeviceConfigurationController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.DeviceConfiguration;
+import com.jpsoft.employment.modules.manage.service.DeviceConfigurationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/deviceConfiguration")
+@Api(description = "deviceConfiguration")
+public class DeviceConfigurationController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private DeviceConfigurationService deviceConfigurationService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<DeviceConfiguration> create(){
+        MessageResult<DeviceConfiguration> msgResult = new MessageResult<>();
+
+        DeviceConfiguration deviceConfiguration = new DeviceConfiguration();
+
+        msgResult.setData(deviceConfiguration);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<DeviceConfiguration> add(@RequestBody DeviceConfiguration deviceConfiguration,@RequestAttribute String subject){
+        MessageResult<DeviceConfiguration> msgResult = new MessageResult<>();
+
+        try {
+            deviceConfiguration.setId(UUID.randomUUID().toString());
+            deviceConfiguration.setDelFlag(false);
+            deviceConfiguration.setCreateBy(subject);
+            deviceConfiguration.setCreateTime(new Date());
+            
+            int affectCount = deviceConfigurationService.insert(deviceConfiguration);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(deviceConfiguration);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<DeviceConfiguration> edit(@PathVariable("id") String id){
+        MessageResult<DeviceConfiguration> msgResult = new MessageResult<>();
+
+        try {
+            DeviceConfiguration deviceConfiguration = deviceConfigurationService.get(id);
+
+            if (deviceConfiguration != null) {
+                msgResult.setResult(true);
+                msgResult.setData(deviceConfiguration);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<DeviceConfiguration> update(@RequestBody DeviceConfiguration deviceConfiguration,@RequestAttribute String subject){
+        MessageResult<DeviceConfiguration> msgResult = new MessageResult<>();
+
+        try {
+            deviceConfiguration.setUpdateBy(subject);
+            deviceConfiguration.setUpdateTime(new Date());
+            
+            int affectCount = deviceConfigurationService.update(deviceConfiguration);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(deviceConfiguration);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            DeviceConfiguration deviceConfiguration = deviceConfigurationService.get(id);
+            deviceConfiguration.setDelFlag(true);
+            deviceConfiguration.setUpdateBy(subject);
+            deviceConfiguration.setUpdateTime(new Date());
+
+            int affectCount = deviceConfigurationService.update(deviceConfiguration);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                DeviceConfiguration deviceConfiguration = deviceConfigurationService.get(id);
+                deviceConfiguration.setDelFlag(true);
+                deviceConfiguration.setUpdateBy(subject);
+                deviceConfiguration.setUpdateTime(new Date());
+
+                affectCount += deviceConfigurationService.update(deviceConfiguration);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<DeviceConfiguration> page = deviceConfigurationService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 225 - 0
web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairAdmissionController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.JobFairAdmission;
+import com.jpsoft.employment.modules.manage.service.JobFairAdmissionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/jobFairAdmission")
+@Api(description = "jobFairAdmission")
+public class JobFairAdmissionController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private JobFairAdmissionService jobFairAdmissionService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<JobFairAdmission> create(){
+        MessageResult<JobFairAdmission> msgResult = new MessageResult<>();
+
+        JobFairAdmission jobFairAdmission = new JobFairAdmission();
+
+        msgResult.setData(jobFairAdmission);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<JobFairAdmission> add(@RequestBody JobFairAdmission jobFairAdmission,@RequestAttribute String subject){
+        MessageResult<JobFairAdmission> msgResult = new MessageResult<>();
+
+        try {
+            jobFairAdmission.setId(UUID.randomUUID().toString());
+            jobFairAdmission.setDelFlag(false);
+            jobFairAdmission.setCreateBy(subject);
+            jobFairAdmission.setCreateTime(new Date());
+            
+            int affectCount = jobFairAdmissionService.insert(jobFairAdmission);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairAdmission);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<JobFairAdmission> edit(@PathVariable("id") String id){
+        MessageResult<JobFairAdmission> msgResult = new MessageResult<>();
+
+        try {
+            JobFairAdmission jobFairAdmission = jobFairAdmissionService.get(id);
+
+            if (jobFairAdmission != null) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairAdmission);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<JobFairAdmission> update(@RequestBody JobFairAdmission jobFairAdmission,@RequestAttribute String subject){
+        MessageResult<JobFairAdmission> msgResult = new MessageResult<>();
+
+        try {
+            jobFairAdmission.setUpdateBy(subject);
+            jobFairAdmission.setUpdateTime(new Date());
+            
+            int affectCount = jobFairAdmissionService.update(jobFairAdmission);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairAdmission);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            JobFairAdmission jobFairAdmission = jobFairAdmissionService.get(id);
+            jobFairAdmission.setDelFlag(true);
+            jobFairAdmission.setUpdateBy(subject);
+            jobFairAdmission.setUpdateTime(new Date());
+
+            int affectCount = jobFairAdmissionService.update(jobFairAdmission);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                JobFairAdmission jobFairAdmission = jobFairAdmissionService.get(id);
+                jobFairAdmission.setDelFlag(true);
+                jobFairAdmission.setUpdateBy(subject);
+                jobFairAdmission.setUpdateTime(new Date());
+
+                affectCount += jobFairAdmissionService.update(jobFairAdmission);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<JobFairAdmission> page = jobFairAdmissionService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 225 - 0
web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairCompanyController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.JobFairCompany;
+import com.jpsoft.employment.modules.manage.service.JobFairCompanyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/jobFairCompany")
+@Api(description = "jobFairCompany")
+public class JobFairCompanyController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private JobFairCompanyService jobFairCompanyService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<JobFairCompany> create(){
+        MessageResult<JobFairCompany> msgResult = new MessageResult<>();
+
+        JobFairCompany jobFairCompany = new JobFairCompany();
+
+        msgResult.setData(jobFairCompany);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<JobFairCompany> add(@RequestBody JobFairCompany jobFairCompany,@RequestAttribute String subject){
+        MessageResult<JobFairCompany> msgResult = new MessageResult<>();
+
+        try {
+            jobFairCompany.setId(UUID.randomUUID().toString());
+            jobFairCompany.setDelFlag(false);
+            jobFairCompany.setCreateBy(subject);
+            jobFairCompany.setCreateTime(new Date());
+            
+            int affectCount = jobFairCompanyService.insert(jobFairCompany);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairCompany);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<JobFairCompany> edit(@PathVariable("id") String id){
+        MessageResult<JobFairCompany> msgResult = new MessageResult<>();
+
+        try {
+            JobFairCompany jobFairCompany = jobFairCompanyService.get(id);
+
+            if (jobFairCompany != null) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairCompany);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<JobFairCompany> update(@RequestBody JobFairCompany jobFairCompany,@RequestAttribute String subject){
+        MessageResult<JobFairCompany> msgResult = new MessageResult<>();
+
+        try {
+            jobFairCompany.setUpdateBy(subject);
+            jobFairCompany.setUpdateTime(new Date());
+            
+            int affectCount = jobFairCompanyService.update(jobFairCompany);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairCompany);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            JobFairCompany jobFairCompany = jobFairCompanyService.get(id);
+            jobFairCompany.setDelFlag(true);
+            jobFairCompany.setUpdateBy(subject);
+            jobFairCompany.setUpdateTime(new Date());
+
+            int affectCount = jobFairCompanyService.update(jobFairCompany);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                JobFairCompany jobFairCompany = jobFairCompanyService.get(id);
+                jobFairCompany.setDelFlag(true);
+                jobFairCompany.setUpdateBy(subject);
+                jobFairCompany.setUpdateTime(new Date());
+
+                affectCount += jobFairCompanyService.update(jobFairCompany);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<JobFairCompany> page = jobFairCompanyService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 248 - 0
web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairController.java

@@ -0,0 +1,248 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.Company;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.JobFair;
+import com.jpsoft.employment.modules.manage.service.JobFairService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/jobFair")
+@Api(description = "jobFair")
+public class JobFairController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private JobFairService jobFairService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<JobFair> create(){
+        MessageResult<JobFair> msgResult = new MessageResult<>();
+
+        JobFair jobFair = new JobFair();
+
+        msgResult.setData(jobFair);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<JobFair> add(@RequestBody JobFair jobFair,@RequestAttribute String subject){
+        MessageResult<JobFair> msgResult = new MessageResult<>();
+
+        try {
+            jobFair.setId(UUID.randomUUID().toString());
+            jobFair.setDelFlag(false);
+            jobFair.setCreateBy(subject);
+            jobFair.setCreateTime(new Date());
+            
+            int affectCount = jobFairService.insert(jobFair);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFair);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<JobFair> edit(@PathVariable("id") String id){
+        MessageResult<JobFair> msgResult = new MessageResult<>();
+
+        try {
+            JobFair jobFair = jobFairService.get(id);
+
+            if (jobFair != null) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFair);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<JobFair> update(@RequestBody JobFair jobFair,@RequestAttribute String subject){
+        MessageResult<JobFair> msgResult = new MessageResult<>();
+
+        try {
+            jobFair.setUpdateBy(subject);
+            jobFair.setUpdateTime(new Date());
+            
+            int affectCount = jobFairService.update(jobFair);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFair);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            JobFair jobFair = jobFairService.get(id);
+            jobFair.setDelFlag(true);
+            jobFair.setUpdateBy(subject);
+            jobFair.setUpdateTime(new Date());
+
+            int affectCount = jobFairService.update(jobFair);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                JobFair jobFair = jobFairService.get(id);
+                jobFair.setDelFlag(true);
+                jobFair.setUpdateBy(subject);
+                jobFair.setUpdateTime(new Date());
+
+                affectCount += jobFairService.update(jobFair);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<JobFair> page = jobFairService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "list", method = RequestMethod.POST)
+    public MessageResult<List> list() {
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("start_time","asc"));
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        searchParams.put("nowDate",sdf.format(new Date()));
+
+        Page<JobFair> page = jobFairService.pageSearch(searchParams,1,1000,false, sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(page.getResult());
+
+        return msgResult;
+    }
+}

+ 225 - 0
web/src/main/java/com/jpsoft/employment/modules/manage/controller/JobFairDeliverRecordController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.JobFairDeliverRecord;
+import com.jpsoft.employment.modules.manage.service.JobFairDeliverRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/jobFairDeliverRecord")
+@Api(description = "jobFairDeliverRecord")
+public class JobFairDeliverRecordController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private JobFairDeliverRecordService jobFairDeliverRecordService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<JobFairDeliverRecord> create(){
+        MessageResult<JobFairDeliverRecord> msgResult = new MessageResult<>();
+
+        JobFairDeliverRecord jobFairDeliverRecord = new JobFairDeliverRecord();
+
+        msgResult.setData(jobFairDeliverRecord);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<JobFairDeliverRecord> add(@RequestBody JobFairDeliverRecord jobFairDeliverRecord,@RequestAttribute String subject){
+        MessageResult<JobFairDeliverRecord> msgResult = new MessageResult<>();
+
+        try {
+            jobFairDeliverRecord.setId(UUID.randomUUID().toString());
+            jobFairDeliverRecord.setDelFlag(false);
+            jobFairDeliverRecord.setCreateBy(subject);
+            jobFairDeliverRecord.setCreateTime(new Date());
+            
+            int affectCount = jobFairDeliverRecordService.insert(jobFairDeliverRecord);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairDeliverRecord);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<JobFairDeliverRecord> edit(@PathVariable("id") String id){
+        MessageResult<JobFairDeliverRecord> msgResult = new MessageResult<>();
+
+        try {
+            JobFairDeliverRecord jobFairDeliverRecord = jobFairDeliverRecordService.get(id);
+
+            if (jobFairDeliverRecord != null) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairDeliverRecord);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<JobFairDeliverRecord> update(@RequestBody JobFairDeliverRecord jobFairDeliverRecord,@RequestAttribute String subject){
+        MessageResult<JobFairDeliverRecord> msgResult = new MessageResult<>();
+
+        try {
+            jobFairDeliverRecord.setUpdateBy(subject);
+            jobFairDeliverRecord.setUpdateTime(new Date());
+            
+            int affectCount = jobFairDeliverRecordService.update(jobFairDeliverRecord);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(jobFairDeliverRecord);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            JobFairDeliverRecord jobFairDeliverRecord = jobFairDeliverRecordService.get(id);
+            jobFairDeliverRecord.setDelFlag(true);
+            jobFairDeliverRecord.setUpdateBy(subject);
+            jobFairDeliverRecord.setUpdateTime(new Date());
+
+            int affectCount = jobFairDeliverRecordService.update(jobFairDeliverRecord);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                JobFairDeliverRecord jobFairDeliverRecord = jobFairDeliverRecordService.get(id);
+                jobFairDeliverRecord.setDelFlag(true);
+                jobFairDeliverRecord.setUpdateBy(subject);
+                jobFairDeliverRecord.setUpdateTime(new Date());
+
+                affectCount += jobFairDeliverRecordService.update(jobFairDeliverRecord);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<JobFairDeliverRecord> page = jobFairDeliverRecordService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 225 - 0
web/src/main/java/com/jpsoft/employment/modules/manage/controller/SeatManageController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.employment.modules.manage.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.manage.entity.SeatManage;
+import com.jpsoft.employment.modules.manage.service.SeatManageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/manage/seatManage")
+@Api(description = "seatManage")
+public class SeatManageController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private SeatManageService seatManageService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<SeatManage> create(){
+        MessageResult<SeatManage> msgResult = new MessageResult<>();
+
+        SeatManage seatManage = new SeatManage();
+
+        msgResult.setData(seatManage);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<SeatManage> add(@RequestBody SeatManage seatManage,@RequestAttribute String subject){
+        MessageResult<SeatManage> msgResult = new MessageResult<>();
+
+        try {
+            seatManage.setId(UUID.randomUUID().toString());
+            seatManage.setDelFlag(false);
+            seatManage.setCreateBy(subject);
+            seatManage.setCreateTime(new Date());
+            
+            int affectCount = seatManageService.insert(seatManage);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(seatManage);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<SeatManage> edit(@PathVariable("id") String id){
+        MessageResult<SeatManage> msgResult = new MessageResult<>();
+
+        try {
+            SeatManage seatManage = seatManageService.get(id);
+
+            if (seatManage != null) {
+                msgResult.setResult(true);
+                msgResult.setData(seatManage);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<SeatManage> update(@RequestBody SeatManage seatManage,@RequestAttribute String subject){
+        MessageResult<SeatManage> msgResult = new MessageResult<>();
+
+        try {
+            seatManage.setUpdateBy(subject);
+            seatManage.setUpdateTime(new Date());
+            
+            int affectCount = seatManageService.update(seatManage);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(seatManage);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            SeatManage seatManage = seatManageService.get(id);
+            seatManage.setDelFlag(true);
+            seatManage.setUpdateBy(subject);
+            seatManage.setUpdateTime(new Date());
+
+            int affectCount = seatManageService.update(seatManage);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                SeatManage seatManage = seatManageService.get(id);
+                seatManage.setDelFlag(true);
+                seatManage.setUpdateBy(subject);
+                seatManage.setUpdateTime(new Date());
+
+                affectCount += seatManageService.update(seatManage);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<SeatManage> page = seatManageService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 6 - 7
web/src/main/resources/application-dev.yml

@@ -5,16 +5,15 @@ server:
 
 spring:
   datasource:
-
     #开发环境
-#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft2016
+     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     username: root
+     password: jpsoft2016
 
     #测试环境
-     url: jdbc:log4jdbc:mysql://121.37.187.149:8100/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     username: root
-     password: jpsoft8121234
+     #url: jdbc:log4jdbc:mysql://121.37.187.149:8100/jp-employment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     #username: root
+     #password: jpsoft8121234
 
     #正式环境
       #url: jdbc:log4jdbc:mysql://hbjpsoft.mysql.rds.aliyuncs.com:3306/enterprise_federation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8