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

src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java

@@ -312,25 +312,12 @@ public class ExamQuestionBankController {
     /**
      * 导出excel
      *
-     * @param request
-     * @param response
      */
     @ApiOperation(value = "导出excel题目管理信息", notes = "导出excel题目管理信息", httpMethod = "POST")
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+    public ModelAndView exportXls(@RequestBody Map<String, Object> map) {
         // Step.1 组装查询条件
-        QueryWrapper<ExamQuestionBank> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ExamQuestionBank examQuestionBank = JSON.parseObject(deString, ExamQuestionBank.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(examQuestionBank, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-//        UserInfo user = SecurityUtils.getUser();
+        QueryWrapper<ExamQuestionBank> queryWrapper = QueryGenerator.initPageQueryWrapper(ExamQuestionBank.class, map);
         //Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         List<ExamQuestionBank> pageList = examQuestionBankService.list(queryWrapper);

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

@@ -641,12 +641,17 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
             BigDecimal bigDecimal = new BigDecimal(num1);
             BigDecimal bigDecimal1 = new BigDecimal(num2);
             BigDecimal bigDecimal2 = new BigDecimal(1);
-            BigDecimal subtract = bigDecimal1.subtract(bigDecimal);
-            subtract = subtract.divide(bigDecimal, 2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal bigDecimal3 = new BigDecimal(100);
+            BigDecimal subtract = bigDecimal.subtract(bigDecimal1);
+            subtract = subtract.divide(bigDecimal1, 2, BigDecimal.ROUND_HALF_UP);
             BigDecimal subtract1 = bigDecimal2.subtract(subtract);
+            subtract1 = subtract1.multiply(bigDecimal3);
             if (subtract1.compareTo(new BigDecimal(0)) < 0) {
                 return new BigDecimal(0);
             }
+            if (subtract1.compareTo(new BigDecimal(20)) > 0) {
+                return new BigDecimal(20);
+            }
             return subtract1.multiply(new BigDecimal(20)).setScale(2, RoundingMode.HALF_UP);
         }
         return new BigDecimal(20);

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -118,7 +119,14 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl<WorkerInfoAudi
         workerInfo.setInserviceType(1);
 
         //调用向正式表添加接口并下发设备
-        WorkerInfo workerInfo1 = workerInfoService.saveWorkerInfo(workerInfo);
+        WorkerInfo workerInfo1 = new WorkerInfo();
+        try {
+            workerInfo1 = workerInfoService.saveWorkerInfo(workerInfo);
+        } catch (Exception e) {
+            log.error("同步人员信息失败:" + workerInfo.getWorkerName() + e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return;
+        }
         if (StringUtils.isNotBlank(workerInfoAuditRecord.getContractInfo())) {
             List<WorkerContract> workerContracts = JSONArray.parseArray(workerInfoAuditRecord.getContractInfo(), WorkerContract.class);
             for (WorkerContract workerContract : workerContracts) {

src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java

@@ -472,9 +472,9 @@ public class XzSecurityQualityInspectionRecordController {
         resultMap.put("dangerEngScore", dangerEngScore);
         resultMap.put("riskScore", riskScore);
         resultMap.put("aiScore", aiScore);
-        BigDecimal total = hiddenDangerScore.add(dangerEngScore).add(riskScore).add(aiScore).add(new BigDecimal(25)).setScale(0, RoundingMode.HALF_UP);
+        BigDecimal total = hiddenDangerScore.add(dangerEngScore).add(riskScore).add(aiScore).add(new BigDecimal(30)).setScale(0, RoundingMode.HALF_UP);
         resultMap.put("total", total);
-        BigDecimal lastMonthTotal = hiddenDangerScore1.add(dangerEngScore1).add(riskScore1).add(aiScore1).add(new BigDecimal(25)).setScale(0, RoundingMode.HALF_UP);
+        BigDecimal lastMonthTotal = hiddenDangerScore1.add(dangerEngScore1).add(riskScore1).add(aiScore1).add(new BigDecimal(30)).setScale(0, RoundingMode.HALF_UP);
         resultMap.put("lastMonthTotal", lastMonthTotal);
         BigDecimal subtract = total.subtract(lastMonthTotal);
         subtract = subtract.divide(lastMonthTotal, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));

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

@@ -727,7 +727,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
             int num1 = list.stream().filter(l -> l.getStatus() != 2 && l.getStatus() != 6).collect(Collectors.toList()).size();
             BigDecimal bigDecimal = new BigDecimal(num1);
             BigDecimal bigDecimal1 = new BigDecimal(list.size());
-            BigDecimal result1 = bigDecimal.divide(bigDecimal1, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.3)).setScale(2, RoundingMode.HALF_UP);
+            BigDecimal result1 = bigDecimal.divide(bigDecimal1, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.4)).setScale(2, RoundingMode.HALF_UP);
 
             int num2 = list.stream().filter(l -> StringUtils.isNotBlank(l.getCompleteTime()) && StringUtils.isNotBlank(l.getChangeLimitTime())
                     && (l.getStatus() != 2 || l.getStatus() != 6) && DateUtil.compare(DateUtil.parseDateTime(l.getChangeLimitTime()), DateUtil.parseDateTime(l.getCompleteTime())) > 0).collect(Collectors.toList()).size();
@@ -738,7 +738,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
             }
             int num3 = list.stream().filter(l -> (l.getStatus() == 5)).collect(Collectors.toList()).size();
             BigDecimal bigDecima4 = new BigDecimal(num3);
-            BigDecimal result3 = bigDecima4.divide(bigDecimal1, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.2)).setScale(2, RoundingMode.HALF_UP);
+            BigDecimal result3 = bigDecima4.divide(bigDecimal1, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.3)).setScale(2, RoundingMode.HALF_UP);
 
             List<Long> ids = xzSecurityInspectTaskRecordService.list(Wrappers.<XzSecurityInspectTaskRecord>lambdaQuery()
                     .eq(XzSecurityInspectTaskRecord::getSn, projectSn)
@@ -756,10 +756,10 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
             }
             result4 = result4.multiply(new BigDecimal(0.2)).setScale(2, RoundingMode.HALF_UP);
 
-            BigDecimal total = result1.add(result2).add(result3).add(result4);
-            return total.multiply(new BigDecimal(25)).setScale(2, RoundingMode.HALF_UP);
+            BigDecimal total = result1.add(result2).add(result3)/*.add(result4)*/;
+            return total.multiply(new BigDecimal(35)).setScale(2, RoundingMode.HALF_UP);
         }
-        return new BigDecimal(25);
+        return new BigDecimal(35);
     }
 
     @Override
@@ -786,9 +786,9 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
                 result2 = new BigDecimal(0.01);
             }
             BigDecimal total = result1.add(result2);
-            return total.multiply(new BigDecimal(15)).setScale(2, RoundingMode.HALF_UP);
+            return total.multiply(new BigDecimal(0)).setScale(2, RoundingMode.HALF_UP);
         }
-        return new BigDecimal(15);
+        return new BigDecimal(0);
     }
 
     @Override