现场部分代码修改

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/controller/VersionController.java

@@ -0,0 +1,20 @@
+package com.xunmei.iot.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description: 高雄
+ * @date 2024/3/2916:06
+ */
+@RestController
+public class VersionController {
+
+    @RequestMapping("/version")
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/VersionController.java

@@ -0,0 +1,20 @@
+package com.xunmei.mediator.api.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description: 高雄
+ * @date 2024/3/2916:06
+ */
+@RestController
+public class VersionController {
+
+    @RequestMapping("/version")
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/OrgPhysicalDefenseConstructionExport.java

@@ -26,7 +26,7 @@ public class OrgPhysicalDefenseConstructionExport {
     private String orgName;
     @ExcelProperty(value = "网点数量", index = 3)
     @ApiModelProperty(value = "网点数量")
-    private Integer networkNumber;
+    private Integer networkNumber = 0;
     @ExcelProperty(value = "营业网点达标率", index = 4)
 
     @ApiModelProperty(value = "营业网点达标率")
@@ -34,24 +34,24 @@ public class OrgPhysicalDefenseConstructionExport {
     @ExcelProperty(value = { "达标建设情况","符合GA38-2015，GA38-2021网点合计数量", "符合GA38-2015，GA38-2021网点合计数量", "符合GA38-2015，GA38-2021网点合计数量", "符合GA38-2015，GA38-2021网点合计数量"}, index = 5)
 
     @ApiModelProperty(value = "符合GA38-2015，GA38-2021网点合计数量")
-    private Integer reachNumber;
+    private Integer reachNumber = 0;
     @ExcelProperty(value = {"达标建设情况","其中，符合GA38-2015网点数量"}, index = 6)
 
     @ApiModelProperty(value = "其中，符合GA38-2015网点数量")
-    private Integer oldReachNumber;
+    private Integer oldReachNumber = 0;
     @ExcelProperty(value = {"达标建设情况","其中，符合GA38-2021网点数量"}, index = 7)
 
     @ApiModelProperty(value = "其中，符合GA38-2021网点数量")
-    private Integer newReachNumber;
+    private Integer newReachNumber = 0;
     @ExcelProperty(value = {"年度已完成达标改造网点情况","已完成GA38-2021达标改造网点合计数量"}, index = 8)
     @ApiModelProperty(value = "已完成GA38-2021达标改造网点合计数量")
-    private Integer newYearReachNumber;
+    private Integer newYearReachNumber = 0;
     @ExcelProperty(value = {"年度已完成达标改造网点情况","其中，改造原有符合GA38-2015网点数量"}, index = 9)
 
     @ApiModelProperty(value = "其中，改造原有符合GA38-2015网点数量")
-    private Integer newYeaTransformOldReachNumber;
+    private Integer newYeaTransformOldReachNumber = 0;
     @ExcelProperty(value = {"年度已完成达标改造网点情况","其中，改造未符合GA38-2015网点数量"}, index = 10)
 
     @ApiModelProperty(value = "其中，改造未符合GA38-2015网点数量")
-    private Integer newYeaTransformInconformityNumber;
+    private Integer newYeaTransformInconformityNumber = 0;
 }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -742,6 +742,8 @@ and
                  where 1=1
                    AND b.deleted = 0
                    AND b.is_lock = 0
+                   AND b.type = 4
+                   AND a.type = 1
                    AND b.deleted = 0
                    AND b.path LIKE concat(#{orgPath}, '%')
                  GROUP BY b.id ) t
@@ -899,7 +901,7 @@ and
                 WHERE
                     a.path LIKE concat( #{orgPath}, '%' )) AS onLineTotal,
             (
-                select SUM(a.size) from (select org_id,if(count(1) > 0,1,0) as size from  sys_org_physical_defense_construction where standard =1 and type = 4 GROUP BY org_id) a
+                select SUM(a.size) from (select org_id,if(count(1) > 0,1,0) as size from  sys_org_physical_defense_construction where standard =1 and type = 2 GROUP BY org_id) a
                                             LEFT JOIN sys_org b on a.org_id = b.id
                 where 1=1
                   AND b.deleted = 0