Guwan
/
Guwan-smartSchool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v2.0.7 

1.修复bug,平台删除设备的bug
This commit is contained in:
gaoben 2021-05-19 10:22:49 +08:00
parent 997f024cdb
commit a794fd4f66
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceController.java
View File

@ -137,18 +137,14 @@ public class SysDeviceController {
@RequiresPermissions("sys:device") @RequiresPermissions("sys:device")
@ApiOperation(value = "删除") @ApiOperation(value = "删除")
public R delete(@RequestBody Long[] deviceIds){ public R delete(@RequestBody Long[] deviceIds){
for(Long devId: deviceIds) {
SysDeviceEntity sysDeviceEntity = sysDeviceService.getById(devId);
//删除同步人员 TenDeviceEntity tenDeviceEntity = tenDeviceService.findBySn(sysDeviceEntity.getSn());
for(Long devId: deviceIds){ if (tenDeviceEntity != null) {
TenDeviceEntity deviceEntity = tenDeviceService.getById(devId); return R.error("设备:"+sysDeviceEntity.getSn()+" 已绑定运营商,请联系运营商先删除");
if(deviceEntity!=null){
return R.error("设备已绑定运营商正在使用，请联系运营商先删除");
} }
} }
sysDeviceService.removeByIds(Arrays.asList(deviceIds));
sysDeviceService.removeByIds(Arrays.asList(deviceIds));
return R.ok(); return R.ok();
} }

8
shapelight-admin/src/main/java/net/shapelight/modules/xian/service/XaApi.java
View File

@ -386,15 +386,15 @@ public class XaApi {
* appid: 1297164778041095 * appid: 1297164778041095
* appsecret: 22971647780410956329716477804109 * appsecret: 22971647780410956329716477804109
* xqid: 610113600000000004538 * xqid: 610113600000000004538
*/ */
String appid = "1297164778041095"; String appid = "1297164778041095";
String appsecret = "22971647780410956329716477804109"; String appsecret = "22971647780410956329716477804109";
//伟丰花园：610113600000000005977 欧风园：610113600000000004538 //伟丰花园：610113600000000005977 欧风园：610113600000000004538
//西安文理学院：610113630000000010348 绿地花都：610113610000000017653 //西安文理学院：610113630000000010348 绿地花都：610113610000000017653
String xqid = "610113600000000004538"; String xqid = "610113600000000004538";
// String address = getAddress(xqid, appid, appsecret); String address = getAddress(xqid, appid, appsecret);
// System.out.println(address); System.out.println(address);
//6.2 获取数据对接接口--------------------------------------------------------------------------- //6.2 获取数据对接接口---------------------------------------------------------------------------
@ -420,7 +420,7 @@ public class XaApi {
//6.3.2 实有人口信息---------------------------------------------------------------------------- //6.3.2 实有人口信息----------------------------------------------------------------------------
// syncPerson(); // syncPerson();
//6.3.9 车辆出入记录------------------------------------------------------------- //6.3.9 车辆出入记录-------------------------------------------------------------
processRecordCarEnter(); // processRecordCarEnter();
} }

2
shapelight-admin/src/main/resources/application-dev.yml
View File

@ -3,7 +3,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.50.232:3306/cell_db_0427?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true url: jdbc:mysql://192.168.50.232:3306/cell_db_0511?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
username: user username: user
password: user@server001 password: user@server001
initial-size: 10 initial-size: 10

2
shapelight-admin/src/main/resources/application.yml
View File

@ -78,7 +78,7 @@ global:
opt_dir: opt opt_dir: opt
db_bak: db_bak:
db_filepath: db_bak db_filepath: db_bak
db_name: cell_db_0427 db_name: cell_db_0511
db_username: root db_username: root
db_password: root db_password: root
db_host: localhost db_host: localhost