Ver código fonte

1、打卡接口新增经纬度字段

machaoyi 1 ano atrás
pai
commit
2063b6608d

+ 10 - 9
.idea/workspace.xml

@@ -5,13 +5,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、新增打卡上班模块">
-      <change afterPath="$PROJECT_DIR$/work/pom.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/controller/WorkClockController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClock.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/mapper/WorkClockMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/mapper/WorkClockMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/service/WorkClockService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -159,7 +152,7 @@
       <workItem from="1705278479826" duration="43131000" />
       <workItem from="1705392945258" duration="4784000" />
       <workItem from="1705397771531" duration="2808000" />
-      <workItem from="1705452083011" duration="2993000" />
+      <workItem from="1705452083011" duration="4465000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -441,7 +434,15 @@
       <option name="project" value="LOCAL" />
       <updated>1705454393928</updated>
     </task>
-    <option name="localTasksCounter" value="36" />
+    <task id="LOCAL-00036" summary="1、新增打卡上班模块">
+      <option name="closed" value="true" />
+      <created>1705455297957</created>
+      <option name="number" value="00036" />
+      <option name="presentableId" value="LOCAL-00036" />
+      <option name="project" value="LOCAL" />
+      <updated>1705455297957</updated>
+    </task>
+    <option name="localTasksCounter" value="37" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

+ 1 - 1
work/src/main/java/com/ctsi/work/WorkClock/controller/WorkClockController.java

@@ -16,7 +16,7 @@ import javax.annotation.Resource;
  /**
  * 员工打卡表;(work_clock)表控制层
  * @author : machaoyi
- * @date : 2024-1-16
+ * @date : 2024-1-17
  */
 @Api(tags = "员工打卡表对象功能接口")
 @RestController

+ 24 - 1
work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClock.java

@@ -7,11 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
 
  /**
  * 员工打卡表;
  * @author : machaoyi
- * @date : 2024-1-16
+ * @date : 2024-1-17
  */
 @ApiModel(value = "员工打卡表",description = "")
 @TableName("work_clock")
@@ -36,6 +37,12 @@ public class WorkClock implements Serializable,Cloneable{
     /** 打卡状态 */
     @ApiModelProperty(value = "打卡状态",notes = "")
     private Integer clockStatus ;
+    /** 经度 */
+    @ApiModelProperty(value = "经度",notes = "")
+    private String lng ;
+    /** 纬度 */
+    @ApiModelProperty(value = "纬度",notes = "")
+    private String lat ;
 
     /** 主键id */
     public Long getId(){
@@ -85,4 +92,20 @@ public class WorkClock implements Serializable,Cloneable{
     public void setClockStatus(Integer clockStatus){
         this.clockStatus=clockStatus;
     }
+    /** 经度 */
+    public String getLng(){
+        return this.lng;
+    }
+    /** 经度 */
+    public void setLng(String lng){
+        this.lng=lng;
+    }
+    /** 纬度 */
+    public String getLat(){
+        return this.lat;
+    }
+    /** 纬度 */
+    public void setLat(String lat){
+        this.lat=lat;
+    }
 }

+ 1 - 1
work/src/main/java/com/ctsi/work/WorkClock/mapper/WorkClockMapper.java

@@ -11,7 +11,7 @@ import com.ctsi.work.WorkClock.entity.WorkClock;
  /**
  * 员工打卡表;(work_clock)表数据库访问层
  * @author : machaoyi
- * @date : 2024-1-16
+ * @date : 2024-1-17
  */
 @Mapper
 public interface WorkClockMapper  extends BaseMapper<WorkClock>{

+ 1 - 1
work/src/main/java/com/ctsi/work/WorkClock/service/WorkClockService.java

@@ -6,7 +6,7 @@ import com.ctsi.work.WorkClock.entity.WorkClock;
  /**
  * 员工打卡表;(work_clock)表服务接口
  * @author : machaoyi
- * @date : 2024-1-16
+ * @date : 2024-1-17
  */
 public interface WorkClockService{
     

+ 13 - 1
work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java

@@ -13,7 +13,7 @@ import com.ctsi.work.WorkClock.service.WorkClockService;
  /**
  * 员工打卡表;(work_clock)表服务实现类
  * @author : machaoyi
- * @date : 2024-1-16
+ * @date : 2024-1-17
  */
 @Service
 public class WorkClockServiceImpl implements WorkClockService{
@@ -47,6 +47,12 @@ public class WorkClockServiceImpl implements WorkClockService{
         if(StrUtil.isNotBlank(workClock.getClockAddr())){
             queryWrapper.eq(WorkClock::getClockAddr, workClock.getClockAddr());
         }
+        if(StrUtil.isNotBlank(workClock.getLng())){
+            queryWrapper.eq(WorkClock::getLng, workClock.getLng());
+        }
+        if(StrUtil.isNotBlank(workClock.getLat())){
+            queryWrapper.eq(WorkClock::getLat, workClock.getLat());
+        }
         //2. 执行分页查询
         Page<WorkClock> pagin = new Page<>(current , size , true);
         IPage<WorkClock> selectResult = workClockMapper.selectPage(pagin , queryWrapper);
@@ -83,6 +89,12 @@ public class WorkClockServiceImpl implements WorkClockService{
         if(StrUtil.isNotBlank(workClock.getClockAddr())){
             chainWrapper.set(WorkClock::getClockAddr, workClock.getClockAddr());
         }
+        if(StrUtil.isNotBlank(workClock.getLng())){
+            chainWrapper.set(WorkClock::getLng, workClock.getLng());
+        }
+        if(StrUtil.isNotBlank(workClock.getLat())){
+            chainWrapper.set(WorkClock::getLat, workClock.getLat());
+        }
         //2. 设置主键,并更新
         chainWrapper.eq(WorkClock::getId, workClock.getId());
         boolean ret = chainWrapper.update();