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

动火作业

Browse Source
This commit is contained in:
pengjie 2024-05-16 16:36:09 +08:00
parent 14a61d46e2
commit 9ed55a8261
4 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
View File

@ -624,6 +624,9 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
BigDecimal subtract = bigDecimal1.subtract(bigDecimal);
subtract = subtract.divide(bigDecimal, 2, BigDecimal.ROUND_HALF_UP);
BigDecimal subtract1 = bigDecimal2.subtract(subtract);
if(subtract1.compareTo(new BigDecimal(0)) < 0) {
return new BigDecimal(0);
}
return subtract1.multiply(new BigDecimal(20)).setScale(2, RoundingMode.HALF_UP);
}
return new BigDecimal(20);

21
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.worker.controller;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.execption.OpenAlertException;
@ -151,4 +152,24 @@ public class WorkerCertificateController {
return Result.success(workerCertificateService.selectProjectManageCertificateTotal(map));
}
/**
* 通过id查询
*
* @param
* @return
*/
@ApiOperation(value = "通过id查询人员证书表信息", notes = "通过id查询人员证书表信息", httpMethod = "POST")
@PostMapping(value = "/queryByType")
public Result<List<WorkerCertificate>> queryByType(@RequestBody Map<String, Object> map) {
Result<List<WorkerCertificate>> result = new Result<List<WorkerCertificate>>();
String workerId = MapUtils.getString(map, "workerId");
Integer certificateType = MapUtils.getInteger(map, "certificateType");
List<WorkerCertificate> workerCertificate = workerCertificateService.list(Wrappers.<WorkerCertificate>lambdaQuery()
.eq(WorkerCertificate::getWorkerId, workerId)
.eq(WorkerCertificate::getCertificateType, certificateType));
result.setResult(workerCertificate);
result.setSuccess(true);
return result;
}
}

16
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java
View File

@ -169,6 +169,22 @@ public class XzSpecialOperationFireSafetyController {
}
}
paramMap.put("safeMeasure", JSON.toJSONString(safeMeasure));
String [] param2 = {"content", "person"};
JSONArray otherSafeMeasures = paramMap.getJSONArray("otherSafeMeasure");
JSONArray otherSafeMeasure = new JSONArray();
if (otherSafeMeasures != null) {
for (int i = 0; i < otherSafeMeasures.size(); i++) {
JSONObject detailObj = new JSONObject();
JSONObject j = otherSafeMeasures.getJSONObject(i);
int k = 0;
for (String s : j.keySet()) {
detailObj.put(param2[k], j.get(s));
k++;
}
otherSafeMeasure.add(detailObj);
}
}
paramMap.put("otherSafeMeasure", JSON.toJSONString(otherSafeMeasure));
XzSpecialOperationFireSafety xzSpecialOperationFireSafety = JSONObject.parseObject(JSON.toJSONString(paramMap), XzSpecialOperationFireSafety.class);
xzSpecialOperationFireSafety.setXzGasAnalyzeList(list);
xzSpecialOperationFireSafetyService.add(xzSpecialOperationFireSafety);

1
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -369,6 +369,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/xmgl/xzWorkerInfoAuditRecord/viewWorkerInfoDetail").permitAll()
.antMatchers("/xmgl/xzSpecialOperationFireSafety/save").permitAll()
.antMatchers("/xmgl/xzLimitSpaceSafe/save").permitAll()
.antMatchers("/xmgl/workerCertificate/queryByType").permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
.anyRequest().authenticated() // 剩下所有的验证都需要验证.
.and()