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-12 15:55:45 +08:00
commit a268b9c747
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java
View File

@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@DataScope @DataScope
public interface CarInfoMapper extends BaseMapper<CarInfo> { public interface CarInfoMapper extends BaseMapper<CarInfo> {
@DataScope(includeTable = "car_info")
List<EntityMap> selectCarList(Page<EntityMap> page, @Param("param") Map<String, Object> map); List<EntityMap> selectCarList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
List<Map<String, Object>> selectCarTypeCount(Map<String, Object> map); List<Map<String, Object>> selectCarTypeCount(Map<String, Object> map);

2
src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
View File

@ -210,6 +210,6 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
result2 = result2.multiply(new BigDecimal(0.4)).setScale(2, RoundingMode.HALF_UP); result2 = result2.multiply(new BigDecimal(0.4)).setScale(2, RoundingMode.HALF_UP);
total = result1.add(result2); total = result1.add(result2);
} }
return total.multiply(new BigDecimal(15)); return total.multiply(new BigDecimal(15)).setScale(2, RoundingMode.HALF_UP);
} }
} }

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

@ -60,6 +60,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*; import java.util.*;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -631,7 +632,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
BigDecimal subtract = bigDecimal1.subtract(bigDecima); BigDecimal subtract = bigDecimal1.subtract(bigDecima);
subtract = subtract.divide(bigDecima, 2, BigDecimal.ROUND_HALF_UP); subtract = subtract.divide(bigDecima, 2, BigDecimal.ROUND_HALF_UP);
BigDecimal subtract1 = bigDecimal2.subtract(subtract); BigDecimal subtract1 = bigDecimal2.subtract(subtract);
return subtract1.multiply(new BigDecimal(20)); return subtract1.multiply(new BigDecimal(20)).setScale(2, RoundingMode.HALF_UP);
} }
private Integer getAlarmType(Integer algorithmId) { private Integer getAlarmType(Integer algorithmId) {

4
src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java
View File

@ -684,7 +684,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
BigDecimal result4 = bigDecimal6.divide(bigDecimal7, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.2)).setScale(2, RoundingMode.HALF_UP); BigDecimal result4 = bigDecimal6.divide(bigDecimal7, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.2)).setScale(2, RoundingMode.HALF_UP);
BigDecimal total = result1.add(result2).add(result3).add(result4); BigDecimal total = result1.add(result2).add(result3).add(result4);
return total.multiply(new BigDecimal(25)); return total.multiply(new BigDecimal(25)).setScale(2, RoundingMode.HALF_UP);
} }
return new BigDecimal(25); return new BigDecimal(25);
} }
@ -708,7 +708,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
result2 = new BigDecimal(0.01); result2 = new BigDecimal(0.01);
} }
BigDecimal total = result1.add(result2); BigDecimal total = result1.add(result2);
return total.multiply(new BigDecimal(15)); return total.multiply(new BigDecimal(15)).setScale(2, RoundingMode.HALF_UP);
} }
private void recoverScore(XzSecurityQualityInspectionRecord hiddenDangerInspectRecord) { private void recoverScore(XzSecurityQualityInspectionRecord hiddenDangerInspectRecord) {