fix: update object

guzijian
1 parent 156e4063
Showing 8 changed files with 87 additions and 37 deletions
ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
ruoyi-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
ruoyi-admin/src/main/java/com/ruoyi/in/domain/SignIn.java
ruoyi-admin/src/main/java/com/ruoyi/in/mapper/SignInMapper.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/propertis/SignInEnum.java
ruoyi-admin/src/main/resources/mapper/in/SignInMapper.xml
@@ -2,6 +2,14 @@ package com.ruoyi;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
 /**
  * web容器中进行部署
@@ -15,4 +23,22 @@ public class RuoYiServletInitializer extends SpringBootServletInitializer
     {
         return application.sources(RuoYiApplication.class);
     }
+
+    // 测试方法
+    public static void main(String[] args) {
+        RestTemplate restTemplate = new RestTemplate();
+        String url = "http://1.14.107.94:8100/driver/driver";
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", "Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImNhOGRhOGJlLWQ0ZjItNDhjMy05ZWU1LWJkMDQzYzY3YzQ0MyJ9.79b8JM31faxhLnIqu6xGtrx1JK019NoN26AwNfPzptYSriHSTABdYp16kzKD538wo2HfXhYoviSqy4qZfoEV5Q");
+        Map<String, String> requestBody = new HashMap<>();
+        requestBody.put("jobCode", "asdfasd");
+        requestBody.put("personnelName", "asdfasdf");
+
+        HttpEntity<Map<String, String>> entity = new HttpEntity<>(requestBody, headers);
+
+        ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST, entity, String.class);
+
+        String responseBody = response.getBody();
+        System.out.println(responseBody);
+    }
 }
@@ -2,9 +2,6 @@ package com.ruoyi.in.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,11 +25,10 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 签到Controller
  * 
  * @author guzijian
- * @date 2023-07-04
+ * @date 2023-07-05
  */
 @RestController
 @RequestMapping("/in/in")
-@Api(tags = "签到管理")
 public class SignInController extends BaseController
 {
     @Autowired
@@ -43,7 +39,6 @@ public class SignInController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('in:in:list')")
     @GetMapping("/list")
-    @ApiOperation("查询签到列表")
     public TableDataInfo list(SignIn signIn)
     {
         startPage();
@@ -57,7 +52,6 @@ public class SignInController extends BaseController
     @PreAuthorize("@ss.hasPermi('in:in:export')")
     @Log(title = "签到", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    @ApiOperation("导出签到列表")
     public void export(HttpServletResponse response, SignIn signIn)
     {
         List<SignIn> list = signInService.selectSignInList(signIn);
@@ -70,7 +64,6 @@ public class SignInController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('in:in:query')")
     @GetMapping(value = "/{id}")
-    @ApiOperation("获取签到详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
         return success(signInService.selectSignInById(id));
@@ -82,7 +75,6 @@ public class SignInController extends BaseController
     @PreAuthorize("@ss.hasPermi('in:in:add')")
     @Log(title = "签到", businessType = BusinessType.INSERT)
     @PostMapping
-    @ApiOperation("新增签到")
     public AjaxResult add(@RequestBody SignIn signIn)
     {
         return toAjax(signInService.insertSignIn(signIn));
@@ -94,7 +86,6 @@ public class SignInController extends BaseController
     @PreAuthorize("@ss.hasPermi('in:in:edit')")
     @Log(title = "签到", businessType = BusinessType.UPDATE)
     @PutMapping
-    @ApiOperation("修改签到")
     public AjaxResult edit(@RequestBody SignIn signIn)
     {
         return toAjax(signInService.updateSignIn(signIn));
@@ -106,7 +97,6 @@ public class SignInController extends BaseController
     @PreAuthorize("@ss.hasPermi('in:in:remove')")
     @Log(title = "签到", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
-    @ApiOperation("删除签到")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(signInService.deleteSignInByIds(ids));
 package com.ruoyi.in.domain;
+import java.math.BigDecimal;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -9,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 签到对象 sign_in
  * 
  * @author guzijian
- * @date 2023-07-04
+ * @date 2023-07-05
  */
 public class SignIn extends BaseEntity
 {
@@ -22,8 +23,8 @@ public class SignIn extends BaseEntity
     @Excel(name = "工号")
     private String jobCode;
-    /** 设备ip */
-    @Excel(name = "设备ip")
+    /** 设备地址 */
+    @Excel(name = "设备地址")
     private String ip;
     /** 图片 */
@@ -42,10 +43,14 @@ public class SignIn extends BaseEntity
     @Excel(name = "酒精测试")
     private Integer alcoholFlag;
-    /** 签到类型 */
-    @Excel(name = "签到类型")
+    /** 签到签退 */
+    @Excel(name = "签到签退")
     private Integer type;
+    /** 酒精摄入量 */
+    @Excel(name = "酒精摄入量")
+    private BigDecimal alcoholIntake;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -118,6 +123,15 @@ public class SignIn extends BaseEntity
     {
         return type;
     }
+    public void setAlcoholIntake(BigDecimal alcoholIntake) 
+    {
+        this.alcoholIntake = alcoholIntake;
+    }
+
+    public BigDecimal getAlcoholIntake() 
+    {
+        return alcoholIntake;
+    }
     @Override
     public String toString() {
@@ -126,13 +140,14 @@ public class SignIn extends BaseEntity
             .append("createTime", getCreateTime())
             .append("jobCode", getJobCode())
             .append("ip", getIp())
-            .append("updateTime", getUpdateTime())
             .append("image", getImage())
             .append("status", getStatus())
             .append("updateBy", getUpdateBy())
             .append("singnIn", getSingnIn())
             .append("alcoholFlag", getAlcoholFlag())
             .append("type", getType())
+            .append("updateTime", getUpdateTime())
+            .append("alcoholIntake", getAlcoholIntake())
             .append("remark", getRemark())
             .toString();
     }
@@ -7,7 +7,7 @@ import com.ruoyi.in.domain.SignIn;
  * 签到Mapper接口
  * 
  * @author guzijian
- * @date 2023-07-04
+ * @date 2023-07-05
  */
 public interface SignInMapper 
 {
@@ -7,7 +7,7 @@ import com.ruoyi.in.domain.SignIn;
  * 签到Service接口
  * 
  * @author guzijian
- * @date 2023-07-04
+ * @date 2023-07-05
  */
 public interface ISignInService 
 {
@@ -3,6 +3,7 @@ package com.ruoyi.in.service.impl;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.propertis.SignInEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.in.mapper.SignInMapper;
@@ -13,7 +14,7 @@ import com.ruoyi.in.service.ISignInService;
  * 签到Service业务层处理
  * 
  * @author guzijian
- * @date 2023-07-04
+ * @date 2023-07-05
  */
 @Service
 public class SignInServiceImpl implements ISignInService 
@@ -55,6 +56,7 @@ public class SignInServiceImpl implements ISignInService
     public int insertSignIn(SignIn signIn)
     {
         signIn.setCreateTime(DateUtils.getNowDate());
+        signIn.setType(SignInEnum.SIGNIN);
         return signInMapper.insertSignIn(signIn);
     }
@@ -67,8 +69,8 @@ public class SignInServiceImpl implements ISignInService
     @Override
     public int updateSignIn(SignIn signIn)
     {
-        signIn.setUpdateTime(DateUtils.getNowDate());
     signIn.setUpdateBy(SecurityUtils.getUsername());
+        signIn.setUpdateTime(DateUtils.getNowDate());
         return signInMapper.updateSignIn(signIn);
     }
+package com.ruoyi.propertis;
+
+public interface SignInEnum {
+    /**
+     * 签到
+     */
+    Integer SIGNIN = 1;
+    /**
+     * 签退
+     */
+    Integer SIGNIN_OUT = 2;
+}
@@ -8,31 +8,33 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="id"    column="id"    />
         <result property="createTime"    column="create_time"    />
         <result property="jobCode"    column="jobCode"    />
-        <result property="image"    column="image"    />
         <result property="ip"    column="ip"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="image"    column="image"    />
         <result property="status"    column="status"    />
         <result property="updateBy"    column="update_by"    />
         <result property="singnIn"    column="singn_in"    />
         <result property="alcoholFlag"    column="alcohol_flag"    />
         <result property="type"    column="type"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="alcoholIntake"    column="alcohol_intake"    />
         <result property="remark"    column="remark"    />
     </resultMap>
     <sql id="selectSignInVo">
-        select id, create_time, jobCode, image, ip, update_time, status, update_by, singn_in, alcohol_flag, type, remark from sign_in
+        select id, create_time, jobCode, ip, image, status, update_by, singn_in, alcohol_flag, type, update_time, alcohol_intake, remark from sign_in
     </sql>
     <select id="selectSignInList" parameterType="SignIn" resultMap="SignInResult">
         <include refid="selectSignInVo"/>
         <where>  
             <if test="jobCode != null  and jobCode != ''"> and jobCode = #{jobCode}</if>
-            <if test="image != null  and image != ''"> and image = #{image}</if>
             <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
+            <if test="image != null  and image != ''"> and image = #{image}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="singnIn != null  and singnIn != ''"> and singn_in = #{singnIn}</if>
             <if test="alcoholFlag != null "> and alcohol_flag = #{alcoholFlag}</if>
             <if test="type != null "> and type = #{type}</if>
+            <if test="alcoholIntake != null "> and alcohol_intake = #{alcoholIntake}</if>
         </where>
     </select>
@@ -45,28 +47,30 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         insert into sign_in
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="createTime != null">create_time,</if>
-            <if test="jobCode != null and jobCode != ''">jobCode,</if>
-            <if test="image != null and image != ''">image,</if>
-            <if test="ip != null and ip != ''">ip,</if>
-            <if test="updateTime != null">update_time,</if>
+            <if test="jobCode != null">jobCode,</if>
+            <if test="ip != null">ip,</if>
+            <if test="image != null">image,</if>
             <if test="status != null">status,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="singnIn != null">singn_in,</if>
             <if test="alcoholFlag != null">alcohol_flag,</if>
             <if test="type != null">type,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="alcoholIntake != null">alcohol_intake,</if>
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">#{createTime},</if>
-            <if test="jobCode != null and jobCode != ''">#{jobCode},</if>
-            <if test="image != null and image != ''">#{image},</if>
-            <if test="ip != null and ip != ''">#{ip},</if>
-            <if test="updateTime != null">#{updateTime},</if>
+            <if test="jobCode != null">#{jobCode},</if>
+            <if test="ip != null">#{ip},</if>
+            <if test="image != null">#{image},</if>
             <if test="status != null">#{status},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="singnIn != null">#{singnIn},</if>
             <if test="alcoholFlag != null">#{alcoholFlag},</if>
             <if test="type != null">#{type},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="alcoholIntake != null">#{alcoholIntake},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
@@ -75,15 +79,16 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         update sign_in
         <trim prefix="SET" suffixOverrides=",">
             <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="jobCode != null and jobCode != ''">jobCode = #{jobCode},</if>
-            <if test="image != null and image != ''">image = #{image},</if>
-            <if test="ip != null and ip != ''">ip = #{ip},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="jobCode != null">jobCode = #{jobCode},</if>
+            <if test="ip != null">ip = #{ip},</if>
+            <if test="image != null">image = #{image},</if>
             <if test="status != null">status = #{status},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="singnIn != null">singn_in = #{singnIn},</if>
             <if test="alcoholFlag != null">alcohol_flag = #{alcoholFlag},</if>
             <if test="type != null">type = #{type},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="alcoholIntake != null">alcohol_intake = #{alcoholIntake},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}