master
masong 2 years ago
parent 3fbfb8939d
commit b28d21ee0e
  1. 1
      .idea/encodings.xml
  2. 29
      pom.xml
  3. 8
      src/main/java/com/cjy/controller/AccessController.java
  4. 7
      src/main/java/com/cjy/service/impl/AccessServiceImpl.java
  5. 4
      src/main/java/com/cjy/util/AjaxResult.java

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/lib" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
</component>
</project>

@ -36,8 +36,27 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-bom</artifactId>
<version>5.8.18</version>
<!-- 加不加这句都能跑,区别只有是否告警 -->
<type>pom</type>
<exclusions>
<exclusion>
<groupId>cn.hutool</groupId>
<artifactId>hutool-system</artifactId>
</exclusion>
<exclusion>
<groupId>cn.hutool</groupId>
<artifactId>hutool-aop</artifactId>
</exclusion>
<exclusion>
<groupId>cn.hutool</groupId>
<artifactId>hutool-cron</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>httpClient</groupId>
<artifactId>httpClient</artifactId>
@ -105,9 +124,9 @@
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
<resources>
<!-- <resource>-->
<!-- <directory>src/main/resources</directory>-->
<!-- </resource>-->
<!-- <resource>-->
<!-- <directory>src/main/resources</directory>-->
<!-- </resource>-->
<resource>
<directory>lib</directory>

@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Map;
/**
* 说明门禁控制器(AccessController)
@ -138,9 +139,10 @@ public class AccessController {
* @param endTime 时间限制
* @return
*/
@GetMapping("/updateQRCode")
public AjaxResult updateQRCode(@RequestParam("idCard") Long idCard,@RequestParam("endTime") String endTime){
@PostMapping("/updateQRCode")
public AjaxResult updateQRCode(@RequestBody Map<String,Object> map){
Long idCard = Long.parseLong(map.get("idCard")+"");
String endTime = map.get("endTime").toString();
return accessService.updateQRCode(idCard,endTime);
}

@ -1,5 +1,7 @@
package com.cjy.service.impl;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.cjy.entity.AccessRight;
import com.cjy.service.AccessService;
import com.cjy.util.AjaxResult;
@ -8,6 +10,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.util.JSONPObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@ -862,7 +865,9 @@ public class AccessServiceImpl implements AccessService {
boolean bvalid = webapi.successIsTrue(strResult);
if (bvalid) {
WgWebapi.logInfo(String.format("%d %s %s ", controllerSN, op, "成功."));
return AjaxResult.success(strResult);
JSONObject jsonObject = JSONUtil.parseObj(strResult);
Object result = jsonObject.get("result");
return AjaxResult.success(result);
} else {
WgWebapi.logInfo(String.format("%d %s %s ", controllerSN, op, "失败..."));

@ -82,9 +82,9 @@ public class AjaxResult extends HashMap<String,Object> {
* @param msg 返回内容
* @return 成功消息
*/
public static AjaxResult success(String msg)
public static AjaxResult success(String data)
{
return AjaxResult.success(msg, null);
return AjaxResult.success("操作成功", data);
}
/**

Loading…
Cancel
Save