Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

提交
提交代码
2024-03-28 13:24:57 +08:00 · 2024-03-28 13:24:41 +08:00 · 2024-03-28 13:24:22 +08:00 · 2024-03-28 13:23:56 +08:00 · 2024-03-28 13:23:41 +08:00
18 changed files with 493 additions and 51 deletions
--- a/ruoyi-ui/public/index.html
+++ b/ruoyi-ui/public/index.html
@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@ -7,8 +8,11 @@
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
  <script src="./easyplayer/EasyWasmPlayer.js"></script>
-    <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=6zAD8CIavtzWnkGg0a7roush5maGMIPn"></script>
-    <title><%= webpackConfig.name %></title>
+  <script type="text/javascript"
+    src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=6zAD8CIavtzWnkGg0a7roush5maGMIPn"></script>
+  <title>
+    <%= webpackConfig.name %>
+  </title>
  <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
  <style>
    html,
@ -18,6 +22,7 @@
      margin: 0px;
      padding: 0px;
    }
+
    .chromeframe {
      margin: 0.2em 0;
      background: #ccc;
@ -94,6 +99,7 @@
        -ms-transform: rotate(0deg);
        transform: rotate(0deg);
      }
+
      100% {
        -webkit-transform: rotate(360deg);
        -ms-transform: rotate(360deg);
@ -107,6 +113,7 @@
        -ms-transform: rotate(0deg);
        transform: rotate(0deg);
      }
+
      100% {
        -webkit-transform: rotate(360deg);
        -ms-transform: rotate(360deg);
@ -195,16 +202,57 @@
      color: #FFF;
      opacity: 0.5;
    }
+
    /* COLOR PICKER */
    .djs-popup.color-picker .entry {
      margin: 0;
    }
+
    .djs-popup.color-picker .djs-popup-group {
      display: grid;
      grid: auto-flow / 1fr 1fr 1fr;
    }
+
+    /*手机*/
+    @media screen and (max-width:600px) {
+      body {
+        background: #191d28 url("http://fileimg.makalu.cc/CORE_40247DD946964A15AA0D4000E1031E19.png") no-repeat bottom/100%;
+      }
+
+      #loader-wrapper .loader-section {
+        position: fixed;
+        top: 0;
+        width: 51%;
+        height: 100%;
+        background: transparent;
+        z-index: 1000;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+      }
+    }
+
+    /*平板*/
+    @media screen and (min-width:600px) and (max-width:960px) {
+      body {
+        background: #191d28 url("http://fileimg.makalu.cc/CORE_40247DD946964A15AA0D4000E1031E19.png") no-repeat bottom/100%;
+      }
+
+      #loader-wrapper .loader-section {
+        position: fixed;
+        top: 0;
+        width: 51%;
+        height: 100%;
+        background: transparent;
+        z-index: 1000;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+      }
+    }
  </style>
 </head>
+
 <body>
  <div id="app">
    <div id="loader-wrapper">
@ -215,4 +263,5 @@
    </div>
  </div>
 </body>
+
 </html>
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@ -8,8 +8,7 @@ import { isRelogin } from '@/utils/request'

 NProgress.configure({ showSpinner: false })

-const whiteList = ['/login', '/register']
-
+const whiteList = ['/login', '/register', '/wxbuild', '/wxbinding']
 router.beforeEach((to, from, next) => {
  NProgress.start()
  if (getToken()) {
@ -20,6 +19,7 @@ router.beforeEach((to, from, next) => {
      NProgress.done()
    } else {
      if (store.getters.roles.length === 0) {
+
        isRelogin.show = true
        // 判断当前用户是否已拉取完user_info信息
        store.dispatch('GetInfo').then(() => {
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@ -61,6 +61,16 @@ export const constantRoutes = [
    component: () => import('@/views/error/401'),
    hidden: true
  },
+  {
+    path: '/wxbuild',
+    component: () => import('@/views/wxsetting/wxInit/build'),
+    hidden: true
+  },
+  {
+    path: '/wxbinding',
+    component: () => import('@/views/wxsetting/wxInit/binding'),
+    hidden: true
+  },
  {
    path: '',
    component: Layout,
--- a/ruoyi-ui/src/views/wxsetting/wxInit/binding.vue
+++ b/ruoyi-ui/src/views/wxsetting/wxInit/binding.vue
--- a/ruoyi-ui/src/views/wxsetting/wxInit/build.vue
+++ b/ruoyi-ui/src/views/wxsetting/wxInit/build.vue
@ -0,0 +1,97 @@
+<template>
+  <div class="app-content">
+    <div class="top"></div>
+    <div class="top-tips">
+      <svg
+        t="1711465680527"
+        class="icon"
+        viewBox="0 0 1059 1024"
+        version="1.1"
+        xmlns="http://www.w3.org/2000/svg"
+        p-id="4613"
+        width="32"
+        height="32"
+      >
+        <path
+          d="M648.490101 1013.692421 648.490101 943.34831C844.095194 897.066596 989.80068 721.769482 989.80068 512 989.80068 302.264649 844.095194 126.967535 648.490101 80.65169L648.490101 34.165189 648.490101 10.341711C882.151323 57.783881 1058.062796 264.345044 1058.062796 512 1058.062796 759.689087 882.151323 966.25025 648.490101 1013.692421ZM68.262116 716.786348C30.547297 716.786348 0 686.239051 0 648.524232L0 375.475768C0 337.79508 30.547297 307.213652 68.262116 307.213652L238.917406 307.213652 546.096927 0.034131 546.096927 1023.965869 238.917406 716.786348 68.262116 716.786348ZM477.834811 853.34471 477.834811 170.723552 273.048463 375.509899 68.262116 375.509899 68.262116 648.558363 273.048463 648.558363 477.834811 853.34471ZM819.14539 494.934471C819.14539 612.550097 749.040197 713.543897 648.490101 759.108859L648.490101 681.392441C709.926005 641.936938 750.883274 573.401773 750.883274 494.934471 750.883274 416.5013 709.926005 347.966136 648.490101 308.510633L648.490101 230.794214C749.040197 276.359176 819.14539 377.352976 819.14539 494.934471Z"
+          fill="#866cff"
+          p-id="4614"
+        ></path>
+      </svg>
+      <span style="vertical-align: middle">关注公众号，接收更多服务提醒</span>
+    </div>
+    <div class="body-imgs">
+      <el-image
+        class="img"
+        src="https://szgcwx.jhncidg.com/staticFiles/qr.jpg"
+      ></el-image>
+    </div>
+    <div class="body_title"> 长按识别或截图扫码关注公众号 </div>
+    <div class="body_title"> 长按识别或截图扫码关注公众号 </div>
+    <div class="body_content"> 关注公众号后在当前页面点击<svg t="1711468259951" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15811" width="32" height="32"><path d="M392.522 926.944c-30.204-14.388-45.066-40.377-45.272-73.982-0.15-43.7 0.793-162.034 1.042-205.73l1.268-221.946c-10.56 11.888-19.918 22.196-28.748 32.909-34.24 41.51-97.297 35.575-121.282-20.623-13.768-32.22-7.347-62.997 16.18-89.559 43.048-48.637 86.23-97.004 129.276-145.243 4.142-4.759 6.162-9.127 6.2-15.641-0.095-29.886 0.34-59.769 0.247-89.654 0.03-5.443 0.978-7.83 7.349-7.793 142.258 0.945 284.776 1.759 427.295 2.44 5.316 0.031 6.767 1.37 6.736 6.81-0.311 31.08-0.356 62.294-0.667 93.374-0.032 5.579 1.002 10.499 3.499 15.3 11.957 22.249 23.653 44.494 35.477 66.878 2.236 4.13 3.145 8.255 3.118 13.038l-1.348 235.889c-0.05 8.635-1.427 16.733-3.6 24.954-10.197 41.117-41.758 55.813-72.163 53.515-13.276-1.139-25.07-6.117-35.782-14.152-7.992 27.456-22.464 49.02-49.614 58.694-27.954 9.803-52.48 1.96-72.82-18.215-27.187 39.3-61.246 48.53-103.489 25.58L494.3 850.481c-0.052 9.166-0.899 18.197-3.739 27.078-13.666 44.686-58.962 68.067-98.039 49.384z m359.267-738.455c6.376 0.036 7.978-1.546 7.88-7.79-0.305-16.473-0.076-33.205 0.285-49.806 0.16-4.786-1.161-5.853-5.945-5.88-121.8-0.564-243.6-1.26-365.262-2.087-4.916-0.028-6.38 1.156-6.283 6.21 0.169 16.866 0.072 33.735-0.289 50.602-0.158 5.446 1.426 6.648 6.741 6.678 60.568 0.214 120.999 0.56 181.57 0.905 60.3 0.344 120.868 0.427 181.303 1.168zM417.78 900.126c16.477-1.633 32.505-17.35 36.065-35.93 0.963-5.039 1.257-10.079 1.286-15.132 0.476-60.167 1.249-195.368 1.322-255.544 0.037-6.376 1.647-8.885 8.016-7.788 0.928 0.136 1.989 0.011 3.055 0.017 6.375 0.036 13.425-1.647 18.994 0.507 6.095 2.426 2.99 11.18 5.611 16.77 2.892 6.257 5.912 12.518 10.658 17.592 18.22 19.628 47.201 15.544 61.282-8.283 6.307-10.856 7.568-22.672 6.84-34.764-0.233-5.844 1.112-8.757 7.481-7.526 1.197 0.139 2.662 0.015 3.856 0.022 6.371 0.036 13.29-1.523 18.992 0.503 6.627 2.565 2.729 11.046 5.347 16.638 3.547 6.926 6.561 13.85 12.377 19.195 28.144 26.463 59.898 1.406 65.082-23.005 3.006-13.66 1.09-27.36 1.832-41.169 0.301-6.108-2.577-13.959 1.167-17.524 3.734-3.83 11.69-0.726 17.67-1.091l0.796 0.004c11.955 0.069 11.69 0.067 14.543 11.37 2.336 9.844 6.798 18.9 14.469 25.588 10.044 8.692 21.705 13.804 35.145 8.835 16.104-5.754 25.87-17.654 29.423-34.235 0.948-4.378 1.245-9.028 1.405-13.674 0.43-75.314 0.86-150.619 1.423-225.929 0.025-4.387-0.88-8.378-3.119-12.24-11.316-19.06-22.627-38.12-33.674-57.307-2.237-4.001-4.62-5.738-9.398-5.765-126.85-0.593-253.701-1.317-380.676-2.175-3.984-0.022-7.042 0.622-9.984 3.926-43.45 49.032-87.297 98.063-130.877 146.96-14.969 16.783-17.478 36.03-10.017 56.261 10.99 29.816 43.625 35.98 65.015 12.46 25.26-27.753 50.13-55.77 75.126-83.787 3.606-3.83 7.088-7.794 12.296-13.344l-0.413 72.389-2.492 436.314c-0.044 7.707 0.71 15.148 3.722 22.602 7.329 18.9 23.073 30.015 40.354 28.26z" p-id="15812" fill="#728ce3"></path></svg>进入授权页面 </div>
+    
+  </div>
+</template>
+
+<script>
+export default {
+  name: "build",
+  data() {
+    return {};
+  },
+  watch: {},
+  created() {},
+  methods: {},
+};
+</script>
+<style scope>
+.app-content {
+  width: 100%;
+  height: 100%;
+  background: #191d28
+    url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_40247DD946964A15AA0D4000E1031E19.png")
+    no-repeat bottom/100%;
+  .top {
+    width: 100%;
+    height: 25px;
+  }
+  .top-tips {
+    width: 90%;
+    height: 45px;
+    margin-left: 20px;
+    margin-right: 20px;
+    line-height: 45px;
+    background-color: #273051;
+    color: #866cff;
+    border-radius: 10px;
+    text-align: center;
+    .icon {
+      padding: 6px;
+      vertical-align: middle;
+    }
+  }
+  .body-imgs {
+    margin-top: 50px;
+    text-align: center;
+    .img {
+      width: 50%;
+    }
+  }
+  .body_title {
+    height: 50px;
+    line-height: 50px;
+    color: #5b9fff;
+    font-size: 15px;
+    font-weight: bold;
+    text-align: center;
+  }
+  .body_content {
+    height: 50px;
+    line-height: 50px;
+    font-size: 15px;
+    font-weight: bold;
+    text-align: center;
+    color: #ffffff;
+  }
+}
+</style>
--- a/ruoyi-wechat/src/main/resources/application-druid.yml
+++ b/ruoyi-wechat/src/main/resources/application-druid.yml
@ -42,7 +42,7 @@ spring:
        druid:
            # 主库数据源
            master:
-                url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+                url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
                username: root
                password: Sxyanzhu@cf
            # 从库数据源
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
@ -210,13 +210,17 @@ public class ProblemmodifyController extends BaseController {
                where.setPrjIds(getProjectIds());
            }
        }
-        Map<String,  List<SmzSspProblemmodify>> map=new HashMap<>();
-        map.put("today",smzSspProblemmodifyService.countByDate(where));
+
+        Map<String,List<Map<String, Object>>> map=new HashMap<>();
+        //map.put("today",smzSspProblemmodifyService.countByDate(where));
+        map.put("today",smzSspProblemmodifyService.countByDateNew(where));
        Date[] dts=DateUtils.getCurrentWeekDate();
        where.setStartDate(dts[0]);
        where.setEndDate(dts[1]);
-        map.put("week",smzSspProblemmodifyService.countByDateRange(where));
-        map.put("group",smzSspProblemmodifyService.groupByInfotypeCheckState(where));
+        //map.put("week",smzSspProblemmodifyService.countByDateRange(where));
+        map.put("week",smzSspProblemmodifyService.countByDateRangeNew(where));
+        //各类型整改、未整改数量统计
+        map.put("group",smzSspProblemmodifyService.groupByInfotypeCheckStateNew(where));
        redisCache.setCacheObject(key, map, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
        return AjaxResult.success(map);
    }
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java
@ -202,7 +202,6 @@ public class SurProjectAttendanceData extends BaseEntity
    @Excel(name = "工人Id")
    private String workerId;

-
    /** 考勤时间yyyy-MM-dd HH:mm:ss */
    @Excel(name = "考勤时间yyyy-MM-dd HH:mm:ss")
    private String attendanceTime;
@ -227,24 +226,31 @@ public class SurProjectAttendanceData extends BaseEntity
    @Excel(name = "平台对应分包商ID")
    private Long vendorId;

-
    /** 设备编号 */
    @Excel(name = "设备编号")
    private String deviceCode;

-
    /** 照片 */
    @Excel(name = "照片")
    private String scanPhoto;

-
    /**  */
    @Excel(name = "数据是否有效")
    private Long isDel;

-
    private Long subDeptId;

+    /** 重要::yanzhu接口接收base64图片 */
+    private String scanPhotoBase64;
+
+    public String getScanPhotoBase64() {
+        return scanPhotoBase64;
+    }
+
+    public void setScanPhotoBase64(String scanPhotoBase64) {
+        this.scanPhotoBase64 = scanPhotoBase64;
+    }
+
    public static SurProjectAttendanceData createFromHuazhu(JSONObject j) {
        SurProjectAttendanceData d=new SurProjectAttendanceData();
        d.vendorsCode="huazhu";
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
@ -157,14 +157,25 @@ public class SurProjectAttendanceUser extends BaseEntity
    @Excel(name = "服务返回的JSON")
    private String other;

-    /**  */
-    @Excel(name = "")
+    /** 是否有效 */
+    @Excel(name = "是否有效")
    private Long isDel;

    /** 人员部门类型 */
    @Excel(name = "人员部门类型")
    private String companyTypeId;

+    /** 重要::yanzhu接口接收base64图片 */
+    private String recentPhotoBase64;
+
+    public String getRecentPhotoBase64() {
+        return recentPhotoBase64;
+    }
+
+    public void setRecentPhotoBase64(String recentPhotoBase64) {
+        this.recentPhotoBase64 = recentPhotoBase64;
+    }
+
    private Date inTime;
    private Date outTime;

--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourDataVo.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourDataVo.java
@ -25,8 +25,8 @@ public class LabourDataVo extends BaseEntity
    private String workerId;

    /** 分包商id */
-    @NotNull(message = "分包商ID不能为空")
-    private Long companyId;
+    @NotBlank(message = "分包商ID不能为空")
+    private String companyId;

    /** 进门还是出门E进，L出 */
    /**
@ -66,11 +66,11 @@ public class LabourDataVo extends BaseEntity
        this.workerId = workerId;
    }

-    public Long getCompanyId() {
+    public String getCompanyId() {
        return companyId;
    }

-    public void setCompanyId(Long companyId) {
+    public void setCompanyId(String companyId) {
        this.companyId = companyId;
    }

--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourGroupVO.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourGroupVO.java
@ -12,8 +12,8 @@ public class LabourGroupVO {
    private String serverid;

    /** 分包商id */
-    @NotNull(message = "分包商ID不能为空")
-    private Long companyId;
+    @NotBlank(message = "分包商ID不能为空")
+    private String companyId;

    /** 分包商名称 */
    @NotBlank(message = "分包商名称不能为空")
@ -43,11 +43,11 @@ public class LabourGroupVO {
        this.serverid = serverid;
    }

-    public Long getCompanyId() {
+    public String getCompanyId() {
        return companyId;
    }

-    public void setCompanyId(Long companyId) {
+    public void setCompanyId(String companyId) {
        this.companyId = companyId;
    }

--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java
@ -74,8 +74,8 @@ public class LabourUserVO {
    private String enterDate;

    /** 分包商id */
-    @NotNull(message = "分包商ID不能为空")
-    private Long companyId;
+    @NotBlank(message = "分包商ID不能为空")
+    private String companyId;

    /** 分包商名称 */
    @Size(max = 64, message = "分包商名称最大64位")
@ -190,11 +190,11 @@ public class LabourUserVO {
        this.enterDate = enterDate;
    }

-    public Long getCompanyId() {
+    public String getCompanyId() {
        return companyId;
    }

-    public void setCompanyId(Long companyId) {
+    public void setCompanyId(String companyId) {
        this.companyId = companyId;
    }

--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
@ -126,6 +126,7 @@ public class AttendanceJgwTask {
        //findTeamByProjectId(appid,token,prjId);
        //findProContractorByProjectId(appid,token,prjId);
        //getJobTypeData(appid,token,"0");
+        findDirectlyUnderTeam(appid,token,prjId);
    }
    public static void findDirectlyUnderTeam(String appId,String token,String projectId,String subcontractorId,int rowId){
        String path="/webapi/project/findDirectlyUnderTeam";
@ -422,6 +423,95 @@ public class AttendanceJgwTask {
            }
        }
    }
+
+    public  static  void querySubcontractorByPhone(String appId,String token,String projectId){
+        String path="webapi/project/querySubcontractorByPhone";
+        String time = System.currentTimeMillis() + "";
+        String startId="100";
+        String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
+
+        String tokenSign = Md5Utils.hash(url);
+    String phone = "18171295380";
+        Map<String, Object> params = new HashMap<>();
+        params.put("appId",appId);
+        params.put("timestamp",time);
+        params.put("tokenSign",tokenSign);
+        params.put("phone",phone);
+        url=host+path+"?appId="+appId+"&tokenSign="+tokenSign+"&phone="+phone+"&timestamp="+time;
+        Request request = new Request.Builder()
+                .url(url)
+                .post(toFormBody(params))
+                .build();
+        String data=AttendanceTask.getResult(request);
+        JSONObject j= JSON.parseObject(data);
+        JSONObject joData= j.getJSONObject("data");
+        JSONArray arr=joData.getJSONArray("teamList");
+        if(arr.size()>0){
+            for(int i=0;i<arr.size();i++){
+                JSONObject json=arr.getJSONObject(i);
+                SurProjectAttendanceGroup group=SurProjectAttendanceGroup.createJgw(json);
+                group.setBizLicense(json.getString("corpCode"));
+                String type=json.getString("corpType");
+                if("009".equals(type)){ //总包人员
+                    group.setCompanyTypeId("1");
+                }else if("007".equals(type)){//监理人员
+                    group.setCompanyTypeId("8");
+                }else if("006".equals(type)){//劳务人员
+                    group.setCompanyTypeId("2");
+                }
+                if(StrUtil.isNotEmpty(group.getCompanyTypeId())){
+
+                }
+
+            }
+        }
+    }
+
+    public  static  void findDirectlyUnderTeam(String appId,String token,String projectId){
+        String path="webapi/project/findDirectlyUnderTeam";
+        String time = System.currentTimeMillis() + "";
+        String startId="0";
+        String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
+
+        String tokenSign = Md5Utils.hash(url);
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("appId",appId);
+        params.put("timestamp",time);
+        params.put("tokenSign",tokenSign);
+        params.put("projectId",projectId);
+        params.put("subcontractorld","ddcffe48c6a7413a91bbf6eafbf037a9");
+        params.put("rowId",0);
+        url=host+path+"?appId="+appId+"&tokenSign="+tokenSign+"&projectId="+projectId+"&timestamp="+time+"&subcontractorld="+params.get("subcontractorld").toString()+"&rowId="+startId;
+        Request request = new Request.Builder()
+                .url(url)
+                .post(toFormBody(params))
+                .build();
+        String data=AttendanceTask.getResult(request);
+        JSONObject j= JSON.parseObject(data);
+        JSONObject joData= j.getJSONObject("data");
+        JSONArray arr=joData.getJSONArray("teamList");
+        if(arr.size()>0){
+            for(int i=0;i<arr.size();i++){
+                JSONObject json=arr.getJSONObject(i);
+                SurProjectAttendanceGroup group=SurProjectAttendanceGroup.createJgw(json);
+                group.setBizLicense(json.getString("corpCode"));
+                String type=json.getString("corpType");
+                if("009".equals(type)){ //总包人员
+                    group.setCompanyTypeId("1");
+                }else if("007".equals(type)){//监理人员
+                    group.setCompanyTypeId("8");
+                }else if("006".equals(type)){//劳务人员
+                    group.setCompanyTypeId("2");
+                }
+                if(StrUtil.isNotEmpty(group.getCompanyTypeId())){
+
+                }
+
+            }
+        }
+    }
+
    public static void findAddWorkerByProject(String appId,String token,String projectId,int startId){
        String path="/webapi/project/findAddWorkerByProject";
        String time = System.currentTimeMillis() + "";
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/AIBoxController.java
@ -2,7 +2,9 @@ package com.yanzhu.jh.publics;

 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.RateLimiter;
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.enums.LimitType;
 import com.yanzhu.jh.video.domain.DevAiProjectDataVO;
 import com.yanzhu.jh.video.service.IDevAiProjectDataService;
 import org.slf4j.Logger;
@ -35,6 +37,7 @@ public class AIBoxController extends BaseController {
     * aibox推送预警数据
     */
    @PostMapping("/v1/push")
+    @RateLimiter(count = 10, limitType = LimitType.IP)
    public void push(@RequestBody Map<String,Object> dataMap)
    {
        try{
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java
@ -115,6 +115,13 @@ public interface SmzSspProblemmodifyMapper
     */
    public List<SmzSspProblemmodify> countByDate(SmzSspProblemmodifyWhere where);

+    /**
+     * 查询某天预警数[新&合并结果集]
+     * @param where startDate 查询的日期
+     * @return
+     */
+    public List<Map<String, Object>> countByDateNew(SmzSspProblemmodifyWhere where);
+
    /**
     * 根据项目统计隐患排查
     *
@ -130,8 +137,22 @@ public interface SmzSspProblemmodifyMapper
     */
    public List<SmzSspProblemmodify> countByDateRange(SmzSspProblemmodifyWhere where);

+    /**
+     * 查询两个日期之间的预警数[新&合并结果集]
+     * @param where startDate 开始日期  endDate 结束日期
+     * @return
+     */
+    public List<Map<String, Object>> countByDateRangeNew(SmzSspProblemmodifyWhere where);
+
    public List<SmzSspProblemmodify> groupByInfotypeCheckState(SmzSspProblemmodifyWhere where);

+    /**
+     * 分组查询预警提醒
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> groupByInfotypeCheckStateNew(SmzSspProblemmodifyWhere where);
+
    public int countTimeout(SmzSspProblemmodifyWhere where);

    /**
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java
@ -122,10 +122,31 @@ public interface ISmzSspProblemmodifyService

    public List<SmzSspProblemmodify> countByDate(SmzSspProblemmodifyWhere where);

+    /**
+     * 查询某天预警数[新&合并结果集]
+     * @param where startDate 查询的日期
+     * @return
+     */
+    public List<Map<String, Object>> countByDateNew(SmzSspProblemmodifyWhere where);
+
    public List<SmzSspProblemmodify> countByDateRange(SmzSspProblemmodifyWhere where);

+    /**
+     * 查询两个日期之间的预警数[新&合并结果集]
+     * @param where startDate 开始日期  endDate 结束日期
+     * @return
+     */
+    public List<Map<String, Object>> countByDateRangeNew(SmzSspProblemmodifyWhere where);
+
    public List<SmzSspProblemmodify> groupByInfotypeCheckState(SmzSspProblemmodifyWhere where);

+    /**
+     * 分组查询预警提醒
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> groupByInfotypeCheckStateNew(SmzSspProblemmodifyWhere where);
+
    public Long countTimeout(SmzSspProblemmodifyWhere where);

    public List<SmzSspProblemmodify> selectSmzSspProblemmodifyListAndUnitName(SmzSspProblemmodifyWhere where);
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java
@ -226,16 +226,47 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi
        return smzSspProblemmodifyMapper.countByDate(where);
    }

+    /**
+     * 查询某天预警数[新&合并结果集]
+     * @param where startDate 查询的日期
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> countByDateNew(SmzSspProblemmodifyWhere where) {
+        List<Map<String, Object>> list = smzSspProblemmodifyMapper.countByDateNew(where);
+        return list;
+    }
+
    @Override
    public List<SmzSspProblemmodify> countByDateRange(SmzSspProblemmodifyWhere where) {
        return smzSspProblemmodifyMapper.countByDateRange(where);
    }

+    /**
+     * 查询两个日期之间的预警数[新&合并结果集]
+     * @param where startDate 开始日期  endDate 结束日期
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> countByDateRangeNew(SmzSspProblemmodifyWhere where) {
+        return smzSspProblemmodifyMapper.countByDateRangeNew(where);
+    }
+
    @Override
    public List<SmzSspProblemmodify> groupByInfotypeCheckState(SmzSspProblemmodifyWhere where) {
        return smzSspProblemmodifyMapper.groupByInfotypeCheckState(where);
    }

+    /**
+     * 分组查询预警提醒
+     * @param where
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> groupByInfotypeCheckStateNew(SmzSspProblemmodifyWhere where) {
+        return smzSspProblemmodifyMapper.groupByInfotypeCheckStateNew(where);
+    }
+
    @Override
    public Long countTimeout(SmzSspProblemmodifyWhere where) {
        return (long) smzSspProblemmodifyMapper.countTimeout(where);
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@ -431,6 +431,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        COUNT(1) as roleType
        FROM
        smz_ssp_problemmodify sp
+        left join sur_project p on p.id=sp.projectId
        left join sys_dict_data sd on sd.dict_value=sp.danger_type
        <if test="infoType==0">and sd.dict_type = 'ssp_aqyhlx'</if>
        <if test="infoType==1">and sd.dict_type = 'ssp_zlyhlx'</if>
@ -440,7 +441,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <if test="startDate!=null">and DATE(sp.createtime) &gt;= DATE(#{startDate})</if>
        <if test="endDate!=null">and DATE(sp.createtime) &lt;= DATE(#{endDate})</if>
        <if test="projectId>0">and sp.projectId=#{projectId}</if>
-        <if test="deptId >0 ">AND sp.deptid = #{deptId}</if>
+        <if test="deptId >0 ">AND p.deptid = #{deptId}</if>
        <if test="prjIds !=null and prjIds.size()>0">
            and sp.projectId in
            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
@ -551,7 +552,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        </if>
        and DATE(createTime)=Date(#{startDate})
        GROUP BY infotype
+    </select>

+    <select id="countByDateNew" parameterType="SmzSspProblemmodifyWhere" resultType="map">
+        select * from (
+        SELECT p.infotype,COUNT(1) as total
+        FROM smz_ssp_problemmodify p
+        left join sur_project sp on sp.id=p.projectId
+        WHERE p.isDel=0
+        <if test="projectId > 0"> and p.projectId=#{projectId}</if>
+        <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and p.projectId in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        and DATE(p.createTime)=Date(#{startDate})
+        GROUP BY p.infotype)s1 where 1=1
+        UNION ALL
+        select '96' as infotype,count(1) as total from dev_ai_project_data  ad
+        left join sur_project sp on ad.project_id=sp.id
+        where 1=1
+        <if test="projectId &gt; 0"> and ad.project_id=#{projectId}</if>
+        <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and ad.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        and DATE(ad.create_time)=Date(#{startDate})
+        and ad.is_del=0
    </select>

    <select id="countByDateRange" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
@ -575,13 +607,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        GROUP BY infotype
    </select>

+    <select id="countByDateRangeNew" parameterType="SmzSspProblemmodifyWhere" resultType="map">
+        select * from (
+        SELECT infotype,COUNT(1) as total FROM smz_ssp_problemmodify WHERE isDel=0
+        <if test="projectId > 0"> and projectId=#{projectId}</if>
+        <if test="projectId &lt;= 0">
+            AND  projectId IN (
+            SELECT id FROM sur_project WHERE isdel=0
+            <if test="deptId >0 ">AND deptid = #{id}</if>
+            )
+        </if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and projectId in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <![CDATA[
+        and DATE(createTime)>=Date(#{startDate}) and Date(createTime)<=Date(#{endDate})
+       ]]>
+        GROUP BY infotype
+        )s1 where 1=1
+        UNION ALL
+        select '96' as infotype,count(1) as total from dev_ai_project_data  ad
+        left join sur_project sp on ad.project_id=sp.id
+        where 1=1
+        <if test="projectId &gt; 0"> and ad.project_id=#{projectId}</if>
+        <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and ad.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        and DATE(ad.create_time) between Date(#{startDate}) and Date(#{endDate})
+        and ad.is_del=0
+    </select>
+    
    <select id="groupByInfotypeCheckState" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
        SELECT infotype,checkState,COUNT(1) id FROM vw_smz_ssp_problemmodify_audit WHERE isDel=0
        <if test="infoType !=null">and infoType=#{infoType}</if>
        <if test="roleType !=null and roleType>0">and roleType=#{roleType}</if>
        <if test="startDate!=null">and DATE(createtime)>=DATE(#{startDate})</if>
        <if test="endDate!=null">and DATE(createtime) &lt;= DATE(#{endDate})</if>
-        <if test="projectId > 0"> and projectId=#{projectId}</if>
+        <if test="projectId &gt; 0"> and projectId=#{projectId}</if>
        <if test="projectId &lt;= 0">
        AND  projectId IN (
        SELECT id FROM sur_project WHERE isdel=0
@ -596,6 +665,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        </if>
        GROUP BY infotype,checkState
    </select>
+
+    <select id="groupByInfotypeCheckStateNew" parameterType="SmzSspProblemmodifyWhere" resultType="map">
+        SELECT p.infotype,p.checkState,COUNT(1) as total
+        FROM smz_ssp_problemmodify p
+        left join sur_project sp on p.projectId=sp.id
+        WHERE p.isDel=0
+        <if test="projectId &gt; 0"> and p.projectId=#{projectId}</if>
+        <if test="deptId >0 ">AND sp.deptid = #{deptId}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and p.projectId in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY p.infotype,p.checkState
+        UNION ALL
+        select '96' as infotype,'4' as checkState,count(1) as total from dev_ai_project_data  ad
+        left join sur_project sp on ad.project_id=sp.id
+        where 1=1
+        <if test="projectId &gt; 0"> and ad.project_id=#{projectId}</if>
+        <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and ad.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        and ad.is_del=0
+    </select>
+
    <select id="countTimeout" parameterType="SmzSspProblemmodifyWhere"  resultType="Integer">
        select count(1) cnt
        FROM vw_smz_ssp_problemmodify_audit WHERE isDel=0
Author	SHA1	Message	Date
姜玉琦	b21bbf095d	Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev	2024-03-28 13:24:57 +08:00
姜玉琦	5531f0d1d7	提交	2024-03-28 13:24:41 +08:00
姜玉琦	bea64274ab	提交代码	2024-03-28 13:24:22 +08:00
姜玉琦	8a761e00a3	提交代码	2024-03-28 13:23:56 +08:00
姜玉琦	9fc9b9e3b2	提交代码	2024-03-28 13:23:41 +08:00