diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index bf93abe..65c64c9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, as INSTALLDATE @@ -973,14 +973,14 @@ - SELECT WELL_NAME AS wellName, WELL_CODE AS wellCode, ORG_CODE, ORG_NAME AS areaName3,PARENT_ID FROM bus_sync_well_info a LEFT JOIN bus_sync_org_relation b ON a.RESPONSIBLE_DEPT = b.ORG_CODE WHERE b.`ORG_TYPE` = 4 - SELECT org_id,org_name as deptName3 FROM bus_sync_org_relation t WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index bf93abe..65c64c9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, as INSTALLDATE @@ -973,14 +973,14 @@ - SELECT WELL_NAME AS wellName, WELL_CODE AS wellCode, ORG_CODE, ORG_NAME AS areaName3,PARENT_ID FROM bus_sync_well_info a LEFT JOIN bus_sync_org_relation b ON a.RESPONSIBLE_DEPT = b.ORG_CODE WHERE b.`ORG_TYPE` = 4 - SELECT org_id,org_name as deptName3 FROM bus_sync_org_relation t WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 453644e..4c3e5d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -94,23 +94,23 @@ /** * 电池电量 */ - @Excel(name = "电池电量", orderNum = "12") - private String cell; +// @Excel(name = "电池电量", orderNum = "12") +// private String cell; /** * 闸井名称 */ - @Excel(name = "闸井名称", orderNum = "9") - private String wellName; +// @Excel(name = "闸井名称", orderNum = "9") +// private String wellName; /** * 班组名称 */ - @Excel(name = "分管班组", orderNum = "10") + @Excel(name = "分管班组", orderNum = "12") private String deptName3; /** * 班组名称 */ - @Excel(name = "片区", orderNum = "11") + @Excel(name = "片区", orderNum = "13") private String areaName3; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index bf93abe..65c64c9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, as INSTALLDATE @@ -973,14 +973,14 @@ - SELECT WELL_NAME AS wellName, WELL_CODE AS wellCode, ORG_CODE, ORG_NAME AS areaName3,PARENT_ID FROM bus_sync_well_info a LEFT JOIN bus_sync_org_relation b ON a.RESPONSIBLE_DEPT = b.ORG_CODE WHERE b.`ORG_TYPE` = 4 - SELECT org_id,org_name as deptName3 FROM bus_sync_org_relation t WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 453644e..4c3e5d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -94,23 +94,23 @@ /** * 电池电量 */ - @Excel(name = "电池电量", orderNum = "12") - private String cell; +// @Excel(name = "电池电量", orderNum = "12") +// private String cell; /** * 闸井名称 */ - @Excel(name = "闸井名称", orderNum = "9") - private String wellName; +// @Excel(name = "闸井名称", orderNum = "9") +// private String wellName; /** * 班组名称 */ - @Excel(name = "分管班组", orderNum = "10") + @Excel(name = "分管班组", orderNum = "12") private String deptName3; /** * 班组名称 */ - @Excel(name = "片区", orderNum = "11") + @Excel(name = "片区", orderNum = "13") private String areaName3; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index beb5506..da726a6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; @@ -24,10 +23,8 @@ import com.casic.missiles.modular.system.service.*; import com.casic.missiles.modular.system.util.HttpUtil; import com.casic.missiles.util.DesTools; -import com.casic.missiles.util.HttpsUtil; import com.casic.missiles.util.SM4Utils; import com.casic.missiles.util.SecurityUtil; -import com.sun.org.apache.xpath.internal.operations.Bool; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +36,6 @@ import org.springframework.validation.FieldError; import org.springframework.validation.Validator; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -143,7 +139,7 @@ entity.setSecretKey(secretKey); boolean flag = super.insert(entity); -// insertSecretKey(entity.getDevcode(),true); + // insertSecretKey(entity.getDevcode(),true); //关联设备集中器信息 if (isAddConcentrator) { @@ -210,14 +206,12 @@ @Transactional(rollbackFor = Exception.class) @Override - public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List deptIds, String isOnline) { - List list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline); - //加入片区字段 - List> area3List = this.baseMapper.selectDept3List(); - //加入班组字段 - List> dept3List= this.baseMapper.selectArea3List(); public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List deptIds, String isOnline, float maxCell) { List list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline, maxCell); + //加入班组字段 + List> dept3List = this.baseMapper.selectDept3List(); + //加入片区字段 + List> area3List = this.baseMapper.selectArea3List(); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); @@ -230,12 +224,12 @@ deviceDto.setCompanyId(dept.getPid()); } deviceDto.setInstallYear(deviceDto.getInstallDate().substring(0, 4)); - area3List.forEach(area3->{ - if(deviceDto.getWellCode().equals(area3.get("wellCode"))){ + area3List.forEach(area3 -> { + if (deviceDto.getWellCode().equals(area3.get("wellCode"))) { deviceDto.setAreaName3(area3.get("areaName3")); deviceDto.setWellName(area3.get("wellName")); - dept3List.forEach(dept3->{ - if(area3.get("PARENT_ID").equals(dept3.get("org_id"))){ + dept3List.forEach(dept3 -> { + if (area3.get("PARENT_ID").equals(dept3.get("org_id"))) { deviceDto.setDeptName3(dept3.get("deptName3")); } }); @@ -363,7 +357,7 @@ device.setWellId(wellDto.getWellId()); device.setSecretKey(secretKey); -// insertSecretKey(device.getDevcode(),true); + // insertSecretKey(device.getDevcode(),true); }); if (ToolUtil.isNotEmpty(list)) { @@ -660,7 +654,7 @@ @Override public Boolean updateKey(Device device) { - return insertSecretKey(device.getDevcode(),false); + return insertSecretKey(device.getDevcode(), false); } private String sm4DeviceReg(String tid, String imei, String iccid) { @@ -784,3 +778,4 @@ return false; } } + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index bf93abe..65c64c9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,WELLNAME AS wellName,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,MANUFACTURE,jobGenerationType, CELL, as INSTALLDATE @@ -973,14 +973,14 @@ - SELECT WELL_NAME AS wellName, WELL_CODE AS wellCode, ORG_CODE, ORG_NAME AS areaName3,PARENT_ID FROM bus_sync_well_info a LEFT JOIN bus_sync_org_relation b ON a.RESPONSIBLE_DEPT = b.ORG_CODE WHERE b.`ORG_TYPE` = 4 - SELECT org_id,org_name as deptName3 FROM bus_sync_org_relation t WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4) diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 453644e..4c3e5d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -94,23 +94,23 @@ /** * 电池电量 */ - @Excel(name = "电池电量", orderNum = "12") - private String cell; +// @Excel(name = "电池电量", orderNum = "12") +// private String cell; /** * 闸井名称 */ - @Excel(name = "闸井名称", orderNum = "9") - private String wellName; +// @Excel(name = "闸井名称", orderNum = "9") +// private String wellName; /** * 班组名称 */ - @Excel(name = "分管班组", orderNum = "10") + @Excel(name = "分管班组", orderNum = "12") private String deptName3; /** * 班组名称 */ - @Excel(name = "片区", orderNum = "11") + @Excel(name = "片区", orderNum = "13") private String areaName3; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index beb5506..da726a6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; @@ -24,10 +23,8 @@ import com.casic.missiles.modular.system.service.*; import com.casic.missiles.modular.system.util.HttpUtil; import com.casic.missiles.util.DesTools; -import com.casic.missiles.util.HttpsUtil; import com.casic.missiles.util.SM4Utils; import com.casic.missiles.util.SecurityUtil; -import com.sun.org.apache.xpath.internal.operations.Bool; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +36,6 @@ import org.springframework.validation.FieldError; import org.springframework.validation.Validator; -import java.io.IOException; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; @@ -143,7 +139,7 @@ entity.setSecretKey(secretKey); boolean flag = super.insert(entity); -// insertSecretKey(entity.getDevcode(),true); + // insertSecretKey(entity.getDevcode(),true); //关联设备集中器信息 if (isAddConcentrator) { @@ -210,14 +206,12 @@ @Transactional(rollbackFor = Exception.class) @Override - public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List deptIds, String isOnline) { - List list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline); - //加入片区字段 - List> area3List = this.baseMapper.selectDept3List(); - //加入班组字段 - List> dept3List= this.baseMapper.selectArea3List(); public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List deptIds, String isOnline, float maxCell) { List list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline, maxCell); + //加入班组字段 + List> dept3List = this.baseMapper.selectDept3List(); + //加入片区字段 + List> area3List = this.baseMapper.selectArea3List(); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); @@ -230,12 +224,12 @@ deviceDto.setCompanyId(dept.getPid()); } deviceDto.setInstallYear(deviceDto.getInstallDate().substring(0, 4)); - area3List.forEach(area3->{ - if(deviceDto.getWellCode().equals(area3.get("wellCode"))){ + area3List.forEach(area3 -> { + if (deviceDto.getWellCode().equals(area3.get("wellCode"))) { deviceDto.setAreaName3(area3.get("areaName3")); deviceDto.setWellName(area3.get("wellName")); - dept3List.forEach(dept3->{ - if(area3.get("PARENT_ID").equals(dept3.get("org_id"))){ + dept3List.forEach(dept3 -> { + if (area3.get("PARENT_ID").equals(dept3.get("org_id"))) { deviceDto.setDeptName3(dept3.get("deptName3")); } }); @@ -363,7 +357,7 @@ device.setWellId(wellDto.getWellId()); device.setSecretKey(secretKey); -// insertSecretKey(device.getDevcode(),true); + // insertSecretKey(device.getDevcode(),true); }); if (ToolUtil.isNotEmpty(list)) { @@ -660,7 +654,7 @@ @Override public Boolean updateKey(Device device) { - return insertSecretKey(device.getDevcode(),false); + return insertSecretKey(device.getDevcode(), false); } private String sm4DeviceReg(String tid, String imei, String iccid) { @@ -784,3 +778,4 @@ return false; } } + diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index cd3e2df..1792c15 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -5,9 +5,12 @@ resources: static-locations: file:/usr/local/tomcat/webapps/ROOT/WEB-INF/classes/config/image/,file:/download/ datasource: - url: jdbc:mysql://172.27.33.49:3306/smartwell_br?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false - username: brzj - password: 9Uhsr&U7H%8 +# url: jdbc:mysql://172.27.33.49:3306/smartwell_br?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false +# username: brzj +# password: 9Uhsr&U7H%8 + url: jdbc:mysql://111.198.10.15:11102/smartwell_br_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false + username: root + password: Casic203! initial-size: 2 min-idle: 1 jms: