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

src/main/java/com/zhgd/xmgl/call/HikvisionCall.java

@@ -206,6 +206,12 @@ public class HikvisionCall {
     @Lazy
     @Autowired
     private ISystemUserService systemUserService;
+    private static String xingzongIscIpPort;
+
+    @Value("${xingzongIscIpPort:}")
+    public void setXingzongIscIpPort(String xingzongIscIpPort) {
+        HikvisionCall.xingzongIscIpPort = xingzongIscIpPort;
+    }
 
     /**
      * 获取图片
@@ -229,7 +235,11 @@ public class HikvisionCall {
         JSONObject rsJo = JSONObject.parseObject(rs);
         String code = rsJo.getString("code");
         if (Objects.equals(code, "0")) {
-            return rsJo.getJSONObject("data").getString("picUrl");
+            String picUrl = rsJo.getJSONObject("data").getString("picUrl");
+            if (EnvironmentUtil.isXingZong()) {
+                picUrl = picUrl.replaceAll("^https:\\/\\/[^/]+\\/", xingzongIscIpPort);
+            }
+            return picUrl;
         }
         return null;
     }

src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml

@@ -55,7 +55,7 @@
     <select id="countWorkerNumByRegion" resultType="com.zhgd.xmgl.modules.safetyhat.entity.vo.WorkerNumAndRegionName">
         select
         qr.region_name,
-        count(*) as workerNum,
+        count(DISTINCT shd.worker_info_id) as workerNum,
         date_format(shd.upload_time,'%Y-%m-%d') AS date
         from quality_region qr
         join safety_hat_fence shf on shf.quality_region_id = qr.id

src/main/resources/application-xingzong.properties

@@ -73,3 +73,4 @@ spring.datasource.db2.jdbc-url=jdbc:mysql://127.0.0.1:3306/wflow_pro?useUnicode=
 spring.datasource.db2.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.db2.username=root
 spring.datasource.db2.password=JXJ@admin
+xingzongIscIpPort=https://10.168.1.100:6113/