diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd7e49f..07f4f72 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd7e49f..07f4f72 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml index dd7e49f..07f4f72 100644 --- a/target/classes/application-dev.yml +++ b/target/classes/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd7e49f..07f4f72 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml index dd7e49f..07f4f72 100644 --- a/target/classes/application-dev.yml +++ b/target/classes/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class index bbe89ab..df003bb 100644 --- a/target/classes/com/casic/controller/DeviceController.class +++ b/target/classes/com/casic/controller/DeviceController.class Binary files differ diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd7e49f..07f4f72 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml index dd7e49f..07f4f72 100644 --- a/target/classes/application-dev.yml +++ b/target/classes/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class index bbe89ab..df003bb 100644 --- a/target/classes/com/casic/controller/DeviceController.class +++ b/target/classes/com/casic/controller/DeviceController.class Binary files differ diff --git a/target/classes/com/casic/dao/AlarmRecordsMapper.class b/target/classes/com/casic/dao/AlarmRecordsMapper.class index f47170d..954d2e7 100644 --- a/target/classes/com/casic/dao/AlarmRecordsMapper.class +++ b/target/classes/com/casic/dao/AlarmRecordsMapper.class Binary files differ diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd7e49f..07f4f72 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml index dd7e49f..07f4f72 100644 --- a/target/classes/application-dev.yml +++ b/target/classes/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class index bbe89ab..df003bb 100644 --- a/target/classes/com/casic/controller/DeviceController.class +++ b/target/classes/com/casic/controller/DeviceController.class Binary files differ diff --git a/target/classes/com/casic/dao/AlarmRecordsMapper.class b/target/classes/com/casic/dao/AlarmRecordsMapper.class index f47170d..954d2e7 100644 --- a/target/classes/com/casic/dao/AlarmRecordsMapper.class +++ b/target/classes/com/casic/dao/AlarmRecordsMapper.class Binary files differ diff --git a/target/classes/com/casic/service/DeviceService.class b/target/classes/com/casic/service/DeviceService.class index 9805d8c..cb20f4e 100644 --- a/target/classes/com/casic/service/DeviceService.class +++ b/target/classes/com/casic/service/DeviceService.class Binary files differ diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd7e49f..07f4f72 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml index dd7e49f..07f4f72 100644 --- a/target/classes/application-dev.yml +++ b/target/classes/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class index bbe89ab..df003bb 100644 --- a/target/classes/com/casic/controller/DeviceController.class +++ b/target/classes/com/casic/controller/DeviceController.class Binary files differ diff --git a/target/classes/com/casic/dao/AlarmRecordsMapper.class b/target/classes/com/casic/dao/AlarmRecordsMapper.class index f47170d..954d2e7 100644 --- a/target/classes/com/casic/dao/AlarmRecordsMapper.class +++ b/target/classes/com/casic/dao/AlarmRecordsMapper.class Binary files differ diff --git a/target/classes/com/casic/service/DeviceService.class b/target/classes/com/casic/service/DeviceService.class index 9805d8c..cb20f4e 100644 --- a/target/classes/com/casic/service/DeviceService.class +++ b/target/classes/com/casic/service/DeviceService.class Binary files differ diff --git a/target/classes/com/casic/service/impl/DeviceServiceImpl.class b/target/classes/com/casic/service/impl/DeviceServiceImpl.class index 52ccc6b..89153ca 100644 --- a/target/classes/com/casic/service/impl/DeviceServiceImpl.class +++ b/target/classes/com/casic/service/impl/DeviceServiceImpl.class Binary files differ diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd7e49f..07f4f72 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml index dd7e49f..07f4f72 100644 --- a/target/classes/application-dev.yml +++ b/target/classes/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class index bbe89ab..df003bb 100644 --- a/target/classes/com/casic/controller/DeviceController.class +++ b/target/classes/com/casic/controller/DeviceController.class Binary files differ diff --git a/target/classes/com/casic/dao/AlarmRecordsMapper.class b/target/classes/com/casic/dao/AlarmRecordsMapper.class index f47170d..954d2e7 100644 --- a/target/classes/com/casic/dao/AlarmRecordsMapper.class +++ b/target/classes/com/casic/dao/AlarmRecordsMapper.class Binary files differ diff --git a/target/classes/com/casic/service/DeviceService.class b/target/classes/com/casic/service/DeviceService.class index 9805d8c..cb20f4e 100644 --- a/target/classes/com/casic/service/DeviceService.class +++ b/target/classes/com/casic/service/DeviceService.class Binary files differ diff --git a/target/classes/com/casic/service/impl/DeviceServiceImpl.class b/target/classes/com/casic/service/impl/DeviceServiceImpl.class index 52ccc6b..89153ca 100644 --- a/target/classes/com/casic/service/impl/DeviceServiceImpl.class +++ b/target/classes/com/casic/service/impl/DeviceServiceImpl.class Binary files differ diff --git a/target/classes/com/casic/util/OAuthUtil.class b/target/classes/com/casic/util/OAuthUtil.class index 91f1e2f..d18f49d 100644 --- a/target/classes/com/casic/util/OAuthUtil.class +++ b/target/classes/com/casic/util/OAuthUtil.class Binary files differ diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd7e49f..07f4f72 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml index dd7e49f..07f4f72 100644 --- a/target/classes/application-dev.yml +++ b/target/classes/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class index bbe89ab..df003bb 100644 --- a/target/classes/com/casic/controller/DeviceController.class +++ b/target/classes/com/casic/controller/DeviceController.class Binary files differ diff --git a/target/classes/com/casic/dao/AlarmRecordsMapper.class b/target/classes/com/casic/dao/AlarmRecordsMapper.class index f47170d..954d2e7 100644 --- a/target/classes/com/casic/dao/AlarmRecordsMapper.class +++ b/target/classes/com/casic/dao/AlarmRecordsMapper.class Binary files differ diff --git a/target/classes/com/casic/service/DeviceService.class b/target/classes/com/casic/service/DeviceService.class index 9805d8c..cb20f4e 100644 --- a/target/classes/com/casic/service/DeviceService.class +++ b/target/classes/com/casic/service/DeviceService.class Binary files differ diff --git a/target/classes/com/casic/service/impl/DeviceServiceImpl.class b/target/classes/com/casic/service/impl/DeviceServiceImpl.class index 52ccc6b..89153ca 100644 --- a/target/classes/com/casic/service/impl/DeviceServiceImpl.class +++ b/target/classes/com/casic/service/impl/DeviceServiceImpl.class Binary files differ diff --git a/target/classes/com/casic/util/OAuthUtil.class b/target/classes/com/casic/util/OAuthUtil.class index 91f1e2f..d18f49d 100644 --- a/target/classes/com/casic/util/OAuthUtil.class +++ b/target/classes/com/casic/util/OAuthUtil.class Binary files differ diff --git a/target/classes/mapper/DeviceMapper.xml b/target/classes/mapper/DeviceMapper.xml index 04569ad..82ad637 100644 --- a/target/classes/mapper/DeviceMapper.xml +++ b/target/classes/mapper/DeviceMapper.xml @@ -1,5 +1,54 @@ - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd7e49f..07f4f72 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml index dd7e49f..07f4f72 100644 --- a/target/classes/application-dev.yml +++ b/target/classes/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class index bbe89ab..df003bb 100644 --- a/target/classes/com/casic/controller/DeviceController.class +++ b/target/classes/com/casic/controller/DeviceController.class Binary files differ diff --git a/target/classes/com/casic/dao/AlarmRecordsMapper.class b/target/classes/com/casic/dao/AlarmRecordsMapper.class index f47170d..954d2e7 100644 --- a/target/classes/com/casic/dao/AlarmRecordsMapper.class +++ b/target/classes/com/casic/dao/AlarmRecordsMapper.class Binary files differ diff --git a/target/classes/com/casic/service/DeviceService.class b/target/classes/com/casic/service/DeviceService.class index 9805d8c..cb20f4e 100644 --- a/target/classes/com/casic/service/DeviceService.class +++ b/target/classes/com/casic/service/DeviceService.class Binary files differ diff --git a/target/classes/com/casic/service/impl/DeviceServiceImpl.class b/target/classes/com/casic/service/impl/DeviceServiceImpl.class index 52ccc6b..89153ca 100644 --- a/target/classes/com/casic/service/impl/DeviceServiceImpl.class +++ b/target/classes/com/casic/service/impl/DeviceServiceImpl.class Binary files differ diff --git a/target/classes/com/casic/util/OAuthUtil.class b/target/classes/com/casic/util/OAuthUtil.class index 91f1e2f..d18f49d 100644 --- a/target/classes/com/casic/util/OAuthUtil.class +++ b/target/classes/com/casic/util/OAuthUtil.class Binary files differ diff --git a/target/classes/mapper/DeviceMapper.xml b/target/classes/mapper/DeviceMapper.xml index 04569ad..82ad637 100644 --- a/target/classes/mapper/DeviceMapper.xml +++ b/target/classes/mapper/DeviceMapper.xml @@ -1,5 +1,54 @@ - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/gas-app-1.0-SNAPSHOT-exec.jar b/target/gas-app-1.0-SNAPSHOT-exec.jar index 447dba4..01991f6 100644 --- a/target/gas-app-1.0-SNAPSHOT-exec.jar +++ b/target/gas-app-1.0-SNAPSHOT-exec.jar Binary files differ diff --git a/src/main/java/com/casic/controller/DeviceController.java b/src/main/java/com/casic/controller/DeviceController.java index 0368627..362327c 100644 --- a/src/main/java/com/casic/controller/DeviceController.java +++ b/src/main/java/com/casic/controller/DeviceController.java @@ -34,20 +34,22 @@ @RequestMapping("/getToken") - public ReturnDTO getToken(@RequestParam String code) { + public ReturnDTO getToken(@RequestParam String code, + @RequestParam boolean isAdmin) { String phone = ""; //获取token - String accessToken = redisTemplate.opsForValue().get(code); +// String accessToken = redisTemplate.opsForValue().get(code); + String accessToken = ""; if (StringUtils.isEmpty(accessToken)) { - accessToken = oAuthUtil.getAccessToken(); - redisTemplate.opsForValue().set(code, accessToken, 2, TimeUnit.DAYS); + accessToken = oAuthUtil.getAccessToken(isAdmin); + redisTemplate.opsForValue().set(code, accessToken, 10, TimeUnit.MINUTES); } //验证token - boolean flag = oAuthUtil.checkAccessToken(accessToken); + boolean flag = oAuthUtil.checkAccessToken(accessToken,isAdmin); //获取手机号 if (flag) { try { - phone = oAuthUtil.getPhone(accessToken, code); + phone = oAuthUtil.getPhone(accessToken, code,isAdmin); System.out.println(phone); } catch (Exception e) { e.printStackTrace(); @@ -89,11 +91,18 @@ return ReturnUtil.success(deviceService.getAlarmRecords(devCode, begTime, endTime, pageNo, pageSize)); } - //根据设备监控数量 + //获取设备监控数量 @RequestMapping("/getIndex") public ReturnDTO getIndex() { return ReturnUtil.success(deviceService.getIndex()); } + //获取店铺数 + @RequestMapping("/getShops") + public ReturnDTO getShops() { + + return ReturnUtil.success(deviceService.count()); + } + } diff --git a/src/main/java/com/casic/dao/AlarmRecordsMapper.java b/src/main/java/com/casic/dao/AlarmRecordsMapper.java index f3eb935..357b671 100644 --- a/src/main/java/com/casic/dao/AlarmRecordsMapper.java +++ b/src/main/java/com/casic/dao/AlarmRecordsMapper.java @@ -21,4 +21,7 @@ "FROM ALARM_DEVICE " + "WHERE ACTIVE=1 AND DEVCODE=#{devcode} ") Device getDevice(@Param("devcode") String devcode); + + @Select("select count(distinct( a.simid)) from alarm_device a where a.active=1 and a.devicetype_id=30") + Long count(); } diff --git a/src/main/java/com/casic/service/DeviceService.java b/src/main/java/com/casic/service/DeviceService.java index 855515a..0024c57 100644 --- a/src/main/java/com/casic/service/DeviceService.java +++ b/src/main/java/com/casic/service/DeviceService.java @@ -18,4 +18,6 @@ Map getIndex(); + Long count(); + } diff --git a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java index eab25dd..f68b7db 100644 --- a/src/main/java/com/casic/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/casic/service/impl/DeviceServiceImpl.java @@ -10,14 +10,10 @@ import com.casic.entity.Device; import com.casic.service.DeviceService; import com.casic.util.DateUtils; -import com.casic.util.SendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import xyz.downgoon.snowflake.Snowflake; import java.text.ParseException; import java.util.ArrayList; @@ -218,4 +214,8 @@ return resultMap; } + @Override + public Long count() { + return alarmRecordsMapper.count(); + } } diff --git a/src/main/java/com/casic/util/OAuthUtil.java b/src/main/java/com/casic/util/OAuthUtil.java index f6ce5c8..396921b 100644 --- a/src/main/java/com/casic/util/OAuthUtil.java +++ b/src/main/java/com/casic/util/OAuthUtil.java @@ -13,16 +13,18 @@ @Component public class OAuthUtil { - public static String Appkey = "hfjikjij"; - private static String AppSecret = "a49489773b1ae7fe6b2302faf2ab3737"; + public static String Appkey = "Gc8NwoQj"; + private static String AppSecret = "857603ec603a34396b2302faf2ab3737"; + public static String AppkeyAdmin = "SKCdk4fX"; + private static String AppSecretAdmin = "ff0e84ebb145559c6b2302faf2ab3737"; private static String code = ""; private static String AccessToken = ""; private static YktAppServiceImpl yktAppServiceImpl = new YktAppServiceImpl(); //生成Code - public static String getAccessToken() { - String CodeResult = yktAppServiceImpl.appCode(Appkey, AppSecret); + public static String getAccessToken(boolean isAdmin) { + String CodeResult = yktAppServiceImpl.appCode(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret); ReponseResult reponseResultCode = JSONObject.parseObject(CodeResult, ReponseResult.class); if (reponseResultCode.isSuccess()) { //从Data中解析code @@ -47,7 +49,7 @@ // String AccessTokenResult= null; String AccessTokenResult = null; try { - AccessTokenResult = yktAppServiceImpl.appAccessToken(Appkey, AppSecret, code); + AccessTokenResult = yktAppServiceImpl.appAccessToken(isAdmin?AppkeyAdmin:Appkey, isAdmin?AppSecretAdmin:AppSecret, code); } catch (Exception e) { e.printStackTrace(); } @@ -72,10 +74,10 @@ return AccessToken; } - public static boolean checkAccessToken(String accessTokenSession) { + public static boolean checkAccessToken(String accessTokenSession,boolean isAdmin) { //校验AccessToken String AccessToken = accessTokenSession; - String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(Appkey, AccessToken); + String VerigyTokenResult = yktAppServiceImpl.VerifyAccessToken(isAdmin?AppkeyAdmin:Appkey, AccessToken); ReponseResult reponseResultVerifyToken = JSONObject.parseObject(VerigyTokenResult, ReponseResult.class); if (reponseResultVerifyToken.isSuccess()) { reponseResultVerifyToken.getMessage(); @@ -87,10 +89,10 @@ } } - public String getPhone(String accesstoken, String code) throws Exception { + public String getPhone(String accesstoken, String code,boolean isAdmin) throws Exception { String param = ""; //封装参数 - param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" + OAuthUtil.Appkey + "&AccessToken=" + accesstoken + "&code=" + code; + param = "https://yikatong.erongjiang.com/sto/yktApp/getUserPhoneNum/v2?" + "AppKey=" +(isAdmin?OAuthUtil.AppkeyAdmin: OAuthUtil.Appkey) + "&AccessToken=" + accesstoken + "&code=" + code; //向一卡通接口发送请求获取手机号 System.out.println(param); String getUserPhoneNum = HttpUtils.doPost(param, ""); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dd7e49f..07f4f72 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml index dd7e49f..07f4f72 100644 --- a/target/classes/application-dev.yml +++ b/target/classes/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 5002 ################### spring配置 ################### spring: datasource: diff --git a/target/classes/com/casic/controller/DeviceController.class b/target/classes/com/casic/controller/DeviceController.class index bbe89ab..df003bb 100644 --- a/target/classes/com/casic/controller/DeviceController.class +++ b/target/classes/com/casic/controller/DeviceController.class Binary files differ diff --git a/target/classes/com/casic/dao/AlarmRecordsMapper.class b/target/classes/com/casic/dao/AlarmRecordsMapper.class index f47170d..954d2e7 100644 --- a/target/classes/com/casic/dao/AlarmRecordsMapper.class +++ b/target/classes/com/casic/dao/AlarmRecordsMapper.class Binary files differ diff --git a/target/classes/com/casic/service/DeviceService.class b/target/classes/com/casic/service/DeviceService.class index 9805d8c..cb20f4e 100644 --- a/target/classes/com/casic/service/DeviceService.class +++ b/target/classes/com/casic/service/DeviceService.class Binary files differ diff --git a/target/classes/com/casic/service/impl/DeviceServiceImpl.class b/target/classes/com/casic/service/impl/DeviceServiceImpl.class index 52ccc6b..89153ca 100644 --- a/target/classes/com/casic/service/impl/DeviceServiceImpl.class +++ b/target/classes/com/casic/service/impl/DeviceServiceImpl.class Binary files differ diff --git a/target/classes/com/casic/util/OAuthUtil.class b/target/classes/com/casic/util/OAuthUtil.class index 91f1e2f..d18f49d 100644 --- a/target/classes/com/casic/util/OAuthUtil.class +++ b/target/classes/com/casic/util/OAuthUtil.class Binary files differ diff --git a/target/classes/mapper/DeviceMapper.xml b/target/classes/mapper/DeviceMapper.xml index 04569ad..82ad637 100644 --- a/target/classes/mapper/DeviceMapper.xml +++ b/target/classes/mapper/DeviceMapper.xml @@ -1,5 +1,54 @@ - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/gas-app-1.0-SNAPSHOT-exec.jar b/target/gas-app-1.0-SNAPSHOT-exec.jar index 447dba4..01991f6 100644 --- a/target/gas-app-1.0-SNAPSHOT-exec.jar +++ b/target/gas-app-1.0-SNAPSHOT-exec.jar Binary files differ diff --git a/target/gas-app-1.0-SNAPSHOT.jar b/target/gas-app-1.0-SNAPSHOT.jar index de32418..f7f0e67 100644 --- a/target/gas-app-1.0-SNAPSHOT.jar +++ b/target/gas-app-1.0-SNAPSHOT.jar Binary files differ