admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-05-18 20:05:28 +08:00
commit f92d38f487
4 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zhgd/mybatis/DataScopeHandler.java
View File

@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.worker.service.impl.UserEnterpriseServiceImpl;
import com.zhgd.xmgl.modules.xz.service.impl.XzSupplierQualificationApplyServiceImpl;
import com.zhgd.xmgl.security.entity.UserInfo;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.EnvironmentUtil;
import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.expression.Alias;
@ -44,6 +45,9 @@ import java.util.stream.Collectors;
@Slf4j
public class DataScopeHandler implements DataPermissionHandler {
@Lazy
@Autowired
EnvironmentUtil environmentUtil;
@Lazy
@Autowired
IAiAnalyseHardWareRecordService aiAnalyseHardWareRecordService;
@ -85,15 +89,17 @@ public class DataScopeHandler implements DataPermissionHandler {
tables.put("xz_task_progress_content", "enterprise_id");
tables.put("xz_task_progress_alarm", "enterprise_id");
tables.put("xz_task_progress", "enterprise_id");
tables.put("enterprise_info", "id");
tables.put("quality_inspection_record", "enterprise_id");
tables.put("worker_info_audit_record", "enterprise_id");
tables.put("car_info", "enterprise_id");
tables.put("xz_material", "enterprise_id");
tables.put("inspect_task_record", "enterprise_id");
tables.put("xz_security_inspect_task_record", "enterprise_id");
tables.put("xz_security_quality_inspection_record", "enterprise_id");
tables.put("team_info", "enterprise_id");
if (!environmentUtil.isBaise()) {
tables.put("car_info", "enterprise_id");
tables.put("enterprise_info", "id");
}
return tables;
}
@ -105,7 +111,9 @@ public class DataScopeHandler implements DataPermissionHandler {
private HashMap<String, String> getFieldAiTables() {
HashMap<String, String> tables = new HashMap<>();
if (!environmentUtil.isBaise()) {
tables.put("ai_analyse_hard_ware_alarm_record", "hardware_id");
}
return tables;
}

32
src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
View File

@ -94,16 +94,7 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
if (StringUtils.isNotEmpty(videoItem.getSerialNumber())) {
videoItem.setSerialNumber(videoItem.getSerialNumber().trim());
}
if (projectVideoConfig.getVideoType() != 2) {
QueryWrapper<VideoItem> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId())
.eq(VideoItem::getSerialNumber, videoItem.getSerialNumber())
.eq(VideoItem::getVerificationCode, videoItem.getVerificationCode());
int count = videoItemMapper.selectCount(queryWrapper);
if (count > 0) {
throw new OpenAlertException(MessageUtil.get("serialNumberAndCodeExistErr"));
}
}
valid(videoItem, projectVideoConfig);
// TODO 此处直接添加成功,暂时不需要添加萤石设备 用户使用此功能前需要先在萤石添加好自己需要的设备,之后在智慧工地平台添加
// if (projectVideoConfig.getVideoType() == 1) {
// String accessToken = YsVideoUtil.getToken(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret());
@ -121,6 +112,27 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
userDevAuthorityService.addDevIdForSubProject(videoItem.getItemId() + "", 2);
}
private void valid(VideoItem videoItem, ProjectVideoConfig projectVideoConfig) {
if (projectVideoConfig.getVideoType() == 3) {
QueryWrapper<VideoItem> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId())
.eq(VideoItem::getSerialNumber, videoItem.getSerialNumber());
int count = videoItemMapper.selectCount(queryWrapper);
if (count > 0) {
throw new OpenAlertException(MessageUtil.get("serialNumberExistErr"));
}
} else if (projectVideoConfig.getVideoType() != 2) {
QueryWrapper<VideoItem> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId())
.eq(VideoItem::getSerialNumber, videoItem.getSerialNumber())
.eq(VideoItem::getVerificationCode, videoItem.getVerificationCode());
int count = videoItemMapper.selectCount(queryWrapper);
if (count > 0) {
throw new OpenAlertException(MessageUtil.get("serialNumberAndCodeExistErr"));
}
}
}
@Override
public void updateVideoItem(VideoItem videoItem) {
ProjectVideoConfig projectVideoConfig = projectVideoConfigMapper.selectById(videoItem.getVideoId());

15
src/main/java/com/zhgd/xmgl/task/ElectricalTask.java
View File

@ -140,11 +140,16 @@ public class ElectricalTask {
log.info("电箱实时数据" + execute.body());
JSONObject result = JSONObject.parseObject(execute.body()).getJSONObject("result");
JSONObject metric = result.getJSONObject("metric");
String temperatures = result.getJSONArray("temperatures").getJSONObject(0).getString("temperature");
ElectricalData electricalData = new ElectricalData(devId, metric.getString("modified"), metric.getString("voltage_a"),
metric.getString("voltage_b"),
metric.getString("voltage_c"), metric.getString("current_a"), metric.getString("current_b"), metric.getString("current_c"),
result.getJSONArray("leakages").getJSONObject(0).getString("leakage"),
String temperatures = String.format("%.1f", Double.parseDouble(result.getJSONArray("temperatures").getJSONObject(0).getString("temperature")));
ElectricalData electricalData = new ElectricalData(devId,
metric.getString("modified"),
String.format("%.1f", Double.parseDouble(metric.getString("voltage_a"))),
String.format("%.1f", Double.parseDouble(metric.getString("voltage_b"))),
String.format("%.1f", Double.parseDouble(metric.getString("voltage_c"))),
String.format("%.1f", Double.parseDouble(metric.getString("current_a"))),
String.format("%.1f", Double.parseDouble(metric.getString("current_b"))),
String.format("%.1f", Double.parseDouble(metric.getString("current_c"))),
String.format("%.1f", Double.parseDouble(result.getJSONArray("leakages").getJSONObject(0).getString("leakage"))),
temperatures, temperatures, temperatures,
temperatures);
electricalDataService.saveElectricalData(electricalData);

17
src/main/java/com/zhgd/xmgl/util/EnvironmentUtil.java
View File

@ -17,15 +17,15 @@ public class EnvironmentUtil {
*/
private static String activeEnvironment;
public static String getActiveEnvironment() {
return activeEnvironment;
}
@Value("${active.environment.name}")
public void setActiveEnvironment(String activeEnvironment) {
EnvironmentUtil.activeEnvironment = activeEnvironment;
}
public static String getActiveEnvironment() {
return activeEnvironment;
}
/**
* 是否本地开发环境
*
@ -125,4 +125,13 @@ public class EnvironmentUtil {
return Stream.of("gxlt-prod", "gxlt-dev").anyMatch(s -> s.equals(activeEnvironment));
}
/**
* 是否baise环境
*
* @return
*/
public boolean isBaise() {
return Stream.of("baise").anyMatch(s -> s.equals(activeEnvironment));
}
}