Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/MybatisGeneratorUtils.java

@@ -44,7 +44,7 @@ public class MybatisGeneratorUtils {
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setUrl("jdbc:mysql://172.16.120.165:3306/usky-fire?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("usky");
         dsc.setPassword("Yt#75Usky");
         mpg.setDataSource(dsc);
@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("base_ggp_facility");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("patrol_inspection_abnormal_picture");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionAttendanceController.java

@@ -58,9 +58,9 @@ public class PatrolInspectionAttendanceController {
         return ApiResult.success();
     }
 
-    @GetMapping("/bodyCount")
-    public ApiResult<List<Map<String, Integer>>> bodyCount() {
-        return ApiResult.success(patrolInspectionAttendanceService.bodyCount());
+    @GetMapping("/securityStatistics")
+    public ApiResult<Map<String, Integer>> securityStatistics() {
+        return ApiResult.success(patrolInspectionAttendanceService.securityStatistics());
     }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionAttendanceService.java

@@ -47,5 +47,5 @@ public interface PatrolInspectionAttendanceService extends CrudService<PatrolIns
      * 签到、签退状态人数统计
      * @return
      */
-    List<Map<String, Integer>> bodyCount();
+    Map<String, Integer> securityStatistics();
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionAttendanceServiceImpl.java

@@ -185,29 +185,25 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
         return name;
     }
 
-    public List<Map<String, Integer>> bodyCount() {
-        List<Map<String, Integer>> returnList = new ArrayList<>();
-        Map<String, Integer> signIn = new HashMap<>();
-        Map<String, Integer> signOut = new HashMap<>();
+    public Map<String, Integer> securityStatistics() {
+        Map<String, Integer> countMap = new HashMap<>();
         int countOut, countIn;
         countOut = baseMapper.signOut(SecurityUtils.getTenantId());
         countIn = baseMapper.signIn(SecurityUtils.getTenantId());
         if (countOut != 0 && countIn == 0) {
-            signIn.put("signIn", 0);
-            signOut.put("signOut", countOut);
+            countMap.put("signIn", 0);
+            countMap.put("signOut", countOut);
         } else if (countOut == 0 && countIn != 0) {
-            signIn.put("signIn", countIn);
-            signOut.put("signOut", 0);
+            countMap.put("signIn", countIn);
+            countMap.put("signOut", 0);
         } else if (countOut == 0 && countIn == 0) {
-            signIn.put("signIn", 0);
-            signOut.put("signOut", 0);
+            countMap.put("signIn", 0);
+            countMap.put("signOut", 0);
         }else {
-            signIn.put("signIn", countIn);
-            signOut.put("signOut", countOut);
+            countMap.put("signIn", countIn);
+            countMap.put("signOut", countOut);
         }
-        returnList.add(signIn);
-        returnList.add(signOut);
-        return returnList;
+        return countMap;
     }
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/util/ExcelUtilImage.java

@@ -268,7 +268,7 @@ public class ExcelUtilImage<T> {
     public void exportExcel(HttpServletResponse response) {
         try {
             this.writeSheet();
-            this.addSignatureAndDate(this.sheet); // 在写入数据后添加签名和日期
+            this.addSignatureAndDate(this.sheet); // 写入数据后添加签名和日期
             this.wb.write(response.getOutputStream());
         } catch (Exception var6) {
             log.error("导出Excel异常{}", var6.getMessage());
@@ -468,6 +468,8 @@ public class ExcelUtilImage<T> {
 
     }
 
+    
+
     public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
         Cell cell = null;
 
@@ -478,6 +480,15 @@ public class ExcelUtilImage<T> {
                 int align = attr.align().value();
                 cell.setCellStyle((CellStyle)this.styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
                 Object value = this.getTargetValue(vo, field, attr);
+                if(value instanceof List) {
+                    List listValue = (List) value;
+                    for(int i = 0; i < listValue.size(); i++) {
+                        Cell newCell = row.createCell(column + i);
+                        newCell.setCellStyle((CellStyle)this.styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
+                        Object elementValue = listValue.get(i);
+                        newCell.setCellValue(elementValue.toString());
+                    }
+                }
                 String dateFormat = attr.dateFormat();
                 String readConverterExp = attr.readConverterExp();
                 String separator = attr.separator();
@@ -502,6 +513,40 @@ public class ExcelUtilImage<T> {
         return cell;
     }
 
+/*    public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
+        Cell cell = null;
+
+        try {
+            row.setHeight(this.maxHeight);
+            if (attr.isExport()) {
+                cell = row.createCell(column);
+                int align = attr.align().value();
+                cell.setCellStyle((CellStyle)this.styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
+                Object value = this.getTargetValue(vo, field, attr);
+                String dateFormat = attr.dateFormat();
+                String readConverterExp = attr.readConverterExp();
+                String separator = attr.separator();
+                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) {
+                    cell.setCellValue(this.parseDateToStr(dateFormat, value));
+                } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) {
+                    cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
+                } else if (value instanceof BigDecimal && -1 != attr.scale()) {
+                    cell.setCellValue(((BigDecimal)value).setScale(attr.scale(), attr.roundingMode()).toString());
+                } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
+                    cell.setCellValue(this.dataFormatHandlerAdapter(value, attr));
+                } else {
+                    this.setCellVo(value, attr, cell);
+                }
+
+                this.addStatisticsData(column, Convert.toStr(value), attr);
+            }
+        } catch (Exception var12) {
+            log.error("导出Excel失败{}", var12);
+        }
+
+        return cell;
+    }*/
+
     public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) {
         DataValidationHelper helper = sheet.getDataValidationHelper();
         DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1");