Browse Source

AttendanceSetController 移动到web-core

shiqian 4 years ago
parent
commit
ab2f73c1b9

+ 6 - 15
boman-modules/boman-system/src/main/java/com/boman/system/controller/AttendanceSetController.java → boman-web-core/src/main/java/com/boman/web/core/controller/AttendanceSetController.java

@@ -1,26 +1,17 @@
-package com.boman.system.controller;
+package com.boman.web.core.controller;
 
-import java.util.List;
-
-import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
-import com.boman.common.security.annotation.PreAuthorize;
-import com.boman.system.domain.AttendanceSet;
-import com.boman.system.service.IAttendanceSetService;
+import com.boman.web.core.domain.AttendanceSet;
+import com.boman.web.core.service.attendance.set.IAttendanceSetService;
 import org.gavaghan.geodesy.GlobalCoordinates;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**

+ 9 - 10
boman-modules/boman-system/src/main/java/com/boman/system/domain/AttendanceSet.java → boman-web-core/src/main/java/com/boman/web/core/domain/AttendanceSet.java

@@ -1,4 +1,4 @@
-package com.boman.system.domain;
+package com.boman.web.core.domain;
 
 import com.boman.common.core.annotation.Excel;
 import com.boman.domain.BaseEntity;
@@ -32,7 +32,7 @@ public class AttendanceSet extends BaseEntity
 
     /** 范围(米) */
     @Excel(name = "范围(米)")
-    private String range;
+    private String limitRange;
 
     /** 是否删除 */
     @Excel(name = "是否删除")
@@ -74,16 +74,15 @@ public class AttendanceSet extends BaseEntity
     {
         return lat;
     }
-    public void setRange(String range) 
-    {
-        this.range = range;
+
+    public String getLimitRange() {
+        return limitRange;
     }
 
-    public String getRange() 
-    {
-        return range;
+    public void setLimitRange(String limitRange) {
+        this.limitRange = limitRange;
     }
-    public void setIsDel(String isDel) 
+    public void setIsDel(String isDel)
     {
         this.isDel = isDel;
     }
@@ -100,7 +99,7 @@ public class AttendanceSet extends BaseEntity
             .append("attendanceAdd", getAttendanceAdd())
             .append("lgt", getLgt())
             .append("lat", getLat())
-            .append("range", getRange())
+            .append("range", getLimitRange())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

+ 2 - 2
boman-modules/boman-system/src/main/java/com/boman/system/mapper/AttendanceSetMapper.java → boman-web-core/src/main/java/com/boman/web/core/mapper/AttendanceSetMapper.java

@@ -1,6 +1,6 @@
-package com.boman.system.mapper;
+package com.boman.web.core.mapper;
 
-import com.boman.system.domain.AttendanceSet;
+import com.boman.web.core.domain.AttendanceSet;
 
 import java.util.List;
 

+ 6 - 6
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/AttendanceSetServiceImpl.java → boman-web-core/src/main/java/com/boman/web/core/service/attendance/set/AttendanceSetServiceImpl.java

@@ -1,17 +1,17 @@
-package com.boman.system.service.impl;
-
-import java.util.List;
+package com.boman.web.core.service.attendance.set;
 
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.LatLgtUtil;
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.system.domain.AttendanceSet;
-import com.boman.system.mapper.AttendanceSetMapper;
-import com.boman.system.service.IAttendanceSetService;
+import com.boman.web.core.domain.AttendanceSet;
+import com.boman.web.core.mapper.AttendanceSetMapper;
 import org.gavaghan.geodesy.Ellipsoid;
 import org.gavaghan.geodesy.GlobalCoordinates;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+
 /**
  * 考勤设置Service业务层处理
  * 

+ 2 - 2
boman-modules/boman-system/src/main/java/com/boman/system/service/IAttendanceSetService.java → boman-web-core/src/main/java/com/boman/web/core/service/attendance/set/IAttendanceSetService.java

@@ -1,7 +1,7 @@
-package com.boman.system.service;
+package com.boman.web.core.service.attendance.set;
 
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.system.domain.AttendanceSet;
+import com.boman.web.core.domain.AttendanceSet;
 import org.gavaghan.geodesy.GlobalCoordinates;
 
 import java.util.List;

+ 1 - 1
boman-modules/boman-system/src/main/resources/mapper/system/AttendanceSetMapper.xml → boman-web-core/src/main/resources/mapper/AttendanceSetMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.boman.system.mapper.AttendanceSetMapper">
+<mapper namespace="com.boman.web.core.mapper.AttendanceSetMapper">
     
     <resultMap type="AttendanceSet" id="AttendanceSetResult">
         <result property="id"    column="id"    />