Merge branch 'main' of http://62.234.3.186:3000/mkl/mkl_cas_ja

mkl-building/pom.xml

@@ -47,6 +47,8 @@
             <groupId>cc.casually</groupId>
             <artifactId>html-parse</artifactId>
             <version>2.1.1</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}\libs\html-parse-2.1.1.jar</systemPath>
         </dependency>
 
         <dependency>

mkl-building/src/main/java/com/ruoyi/utils/FileUtil.java

@@ -1,8 +1,9 @@
 package com.ruoyi.utils;
 
-import sun.misc.BASE64Encoder;
+
 
 import java.io.*;
+import java.util.Base64;
 
 /**
  * 文件管理工具类
@@ -73,6 +74,6 @@ public class FileUtil {
         byte[] buffer = new byte[(int) file.length()];
         inputFile.read(buffer);
         inputFile.close();
-        return new BASE64Encoder().encode(buffer);
+        return Base64.getMimeEncoder().encodeToString(buffer);
     }
 }

mkl-building/src/main/java/com/ruoyi/utils/ImageUtils.java

@@ -1,9 +1,8 @@
 package com.ruoyi.utils;
 
-import org.apache.commons.codec.binary.Base64;
+
 import org.apache.commons.lang3.StringUtils;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
+
 
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReadParam;
@@ -16,6 +15,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Iterator;
 import java.util.UUID;
+import java.util.Base64;
 
 /**
  * mergeImage 合成图拼
@@ -269,7 +269,7 @@ public class ImageUtils {
             // 将图片转化为base64并返回
             byte[] data = outputStream.toByteArray();
             // 此处一定要使用org.apache.tomcat.util.codec.binary.Base64，防止再linux上出现换行等特殊符号
-            base64Image = Base64.encodeBase64String(data);
+            base64Image = Base64.getEncoder().encodeToString(data);
         } catch (Exception e) {
             // 抛出异常
             throw e;
@@ -299,7 +299,7 @@ public class ImageUtils {
         return base64Image;
     }
 
-    static BASE64Decoder decoder = new BASE64Decoder();
+
 
     /**
      * base64压缩图片至指定大小
@@ -319,7 +319,7 @@ public class ImageUtils {
         ByteArrayInputStream inputStream = null;
         try {
 
-            byte[] bytes1 = decoder.decodeBuffer(imageBase);
+            byte[] bytes1 = Base64.getDecoder().decode(imageBase);
             ByteArrayInputStream bais = new ByteArrayInputStream(bytes1);
             BufferedImage image = ImageIO.read(bais);
 
@@ -355,7 +355,7 @@ public class ImageUtils {
             // 将图片转化为base64并返回
             byte[] data = outputStream.toByteArray();
             // 此处一定要使用org.apache.tomcat.util.codec.binary.Base64，防止再linux上出现换行等特殊符号
-            base64Image = Base64.encodeBase64String(data);
+            base64Image = Base64.getEncoder().encodeToString(data);
             if(StringUtils.isEmpty(base64Image)) {
                 base64Image = imageBase;
             }
@@ -402,8 +402,8 @@ public class ImageUtils {
             }
         }
         // 加密
-        BASE64Encoder encoder = new BASE64Encoder();
-        return encoder.encode(data);
+
+        return Base64.getEncoder().encodeToString(data);
     }
 
 }

mkl-business/pom.xml

@@ -26,7 +26,9 @@
         <dependency>
             <groupId>cc.casually</groupId>
             <artifactId>html-parse</artifactId>
-            <version>2.1.5</version>
+            <version>2.1.1</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}\libs\html-parse-2.1.1.jar</systemPath>
         </dependency>
 
         <dependency>

mkl-business/src/main/java/com/ruoyi/helmet/comp/encrypt/AESEncrypt.java

@@ -2,8 +2,7 @@ package com.ruoyi.helmet.comp.encrypt;
 
 
 import com.ruoyi.helmet.comp.conf.ThreeAPIInfo;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
+
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;

mkl-business/src/main/java/com/ruoyi/system/domain/SecurityCheckDetail.java

@@ -54,11 +54,8 @@ public class SecurityCheckDetail extends BaseEntity
     @Excel(name = "整改时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date rectificationTime;
 
-
-
     private String responsibleLoginName;
 
-
     /** 删除状态（0未删除1已删除） */
     private Integer delFlag;
 
@@ -72,8 +69,6 @@ public class SecurityCheckDetail extends BaseEntity
         this.id = id;
     }
 
-
-
     public String getResponsibleLoginName() {
         return responsibleLoginName;
     }

mkl-business/src/main/java/com/ruoyi/system/domain/SmcTypeInfo.java

@@ -51,8 +51,6 @@ public class SmcTypeInfo extends TreeEntity
     @Excel(name = "数据更新人的标识")
     private String updateuserId;
 
-
-
     public void setTypeId(Long typeId)
     {
         this.typeId = typeId;

mkl-business/src/main/java/com/ruoyi/system/domain/SysApplication.java

@@ -92,9 +92,6 @@ public class SysApplication extends BaseEntity {
 
     private Integer delFlag;
 
-
-
-
     public void setId(Long id) {
         this.id = id;
     }

mkl-business/src/main/java/com/ruoyi/system/domain/SysServiceReg.java

@@ -79,7 +79,6 @@ public class SysServiceReg extends BaseEntity
     /** 数据更新用户角色属性名称 */
     private String  roleParam;
 
-
     private String postParam;
 
     public String getAppName() {

mkl-iot/pom.xml

@@ -33,7 +33,9 @@
         <dependency>
             <groupId>cc.casually</groupId>
             <artifactId>html-parse</artifactId>
-            <version>2.1.5</version>
+            <version>2.1.1</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}\libs\html-parse-2.1.1.jar</systemPath>
         </dependency>
 
         <dependency>

mkl-iot/src/main/java/com/ruoyi/iot/conf/HzApiConf.java

@@ -11,9 +11,15 @@ package com.ruoyi.iot.conf;
 public class HzApiConf {
 
     /**
-     * IOT配电箱数据获取HOST
+     * IOT配电箱数据获取HOST&&华筑
      */
     public static String IOT_POWER_HOST = "http://api.1357.cn/hz-condition-monitor";
+
+    /**
+     * IOT配电箱数据获取HOST&&萨达
+     */
+    public static String SD_IOT_POWER_HOST = "https://api.e.v1.i-sada.net";
+
     /**
      * 标养室获取数据HOST
      */

mkl-iot/src/main/java/com/ruoyi/iot/domain/IotDeviceInfo.java

@@ -42,6 +42,10 @@ public class IotDeviceInfo extends BaseEntity
 
     private String hzTenantId;
     private String hzProjectId;
+    private String factoryName;
+    private String companyName;
+    private String projectName;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -121,6 +125,30 @@ public class IotDeviceInfo extends BaseEntity
         this.hzProjectId = hzProjectId;
     }
 
+    public String getFactoryName() {
+        return factoryName;
+    }
+
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

mkl-iot/src/main/java/com/ruoyi/iot/task/GainHzDataTask.java

@@ -5,6 +5,7 @@ import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.HttpUtils;
 import com.ruoyi.iot.conf.HzApiConf;
@@ -46,7 +47,6 @@ import java.util.*;
 @Component("gainHzDataTask")
 public class GainHzDataTask {
 
-
     private static final Logger log = LoggerFactory.getLogger(GainHzDataTask.class);
 
     @Autowired
@@ -61,7 +61,6 @@ public class GainHzDataTask {
     @Autowired
     private IStandardCuringRoomDeviceService iStandardCuringRoomDeviceService;
 
-
     @Autowired
     private IEnvironmentService environmentService;
 
@@ -73,6 +72,7 @@ public class GainHzDataTask {
 
     public static Boolean[] warrning = new Boolean[]{false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false};
     public static Boolean[] warrning1 = new Boolean[]{false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false};
+    public static Boolean[] warrning_power_sd = new Boolean[]{false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false};
 
     @Test
     public void getPowerData() {
@@ -85,6 +85,7 @@ public class GainHzDataTask {
 
         IotDeviceInfo iotDeviceInfo = new IotDeviceInfo();
         iotDeviceInfo.setDeviceName("配电箱");
+        iotDeviceInfo.setFactoryName("华筑");
         List<IotDeviceInfo> iotDeviceInfos = iIotDeviceInfoService.selectIotDeviceInfoList(iotDeviceInfo);
         iotDeviceInfos.forEach(item -> {
             if(item.getHzTenantId() != null && item.getHzProjectId() != null) {
@@ -169,7 +170,6 @@ public class GainHzDataTask {
                 }
             }
         });
-
     }
 
     @Test

mkl-iot/src/main/java/com/ruoyi/iot/task/HntStrengthTask.java

@@ -1,43 +1,20 @@
 package com.ruoyi.iot.task;
 
-import cc.casually.htmlParse.http.*;
-import cc.casually.htmlParse.util.HttpUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.message.MessageOneUtil;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.iot.conf.HzApiConf;
-import com.ruoyi.iot.domain.IotPower;
-import com.ruoyi.iot.domain.IotWarningInfo;
-import com.ruoyi.iot.domain.StandardCuringRoomDevice;
-import com.ruoyi.iot.service.IIotPowerService;
-import com.ruoyi.iot.service.IIotWarningInfoService;
-import com.ruoyi.iot.service.IStandardCuringRoomDeviceService;
 import com.ruoyi.system.mapper.MeasureDeviceMapper;
-import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.utils.HttpUtils;
-import com.ruoyi.weixin.domain.Environment;
 import com.ruoyi.weixin.mapper.ConcreteStrengthDataMapper;
-import com.ruoyi.weixin.mapper.EnvironmentMapper;
-import com.ruoyi.weixin.service.IEnvironmentService;
 import org.apache.commons.collections.map.HashedMap;
-import org.apache.http.HttpResponse;
-import org.apache.http.protocol.HTTP;
-import org.apache.http.util.EntityUtils;
-import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 混凝土强度数据拉取定时任务

mkl-iot/src/main/java/com/ruoyi/iot/task/SadaHzDataTask.java

@@ -0,0 +1,168 @@
+package com.ruoyi.iot.task;
+
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.iot.conf.HzApiConf;
+import com.ruoyi.iot.domain.IotDeviceInfo;
+import com.ruoyi.iot.domain.IotPower;
+import com.ruoyi.iot.domain.IotWarningInfo;
+import com.ruoyi.iot.service.IIotDeviceInfoService;
+import com.ruoyi.iot.service.IIotPowerService;
+import com.ruoyi.iot.service.IIotWarningInfoService;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 萨达配电箱数据定时任务
+ * @Title: SadaHzDataTask
+ * @Package com.yanzhu.xd.system.task
+ * @Author: JiangYuQi
+ * @Copyright 版权归"陕西马卡鲁信息技术有限公司（或个⼈）"所有
+ * @CreateTime: 2024/10/26 17:05
+ */
+@Component("sadaHzDataTask")
+public class SadaHzDataTask {
+
+    private static final Logger log = LoggerFactory.getLogger(SadaHzDataTask.class);
+
+    @Autowired
+    private IIotPowerService iotPowerService;
+
+    @Autowired
+    private IIotWarningInfoService iotWarningInfoService;
+
+    @Autowired
+    private IIotDeviceInfoService iIotDeviceInfoService;
+
+    public static Boolean[] warrning_power_sd = new Boolean[]{false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false};
+
+    @Test
+    public void getPowerData() {
+        //获取当前时间是否需要预警两小时预警一次0，2，4，6，8，10，12，14，16，18，20，22
+        Integer t = Integer.valueOf(new SimpleDateFormat("HH").format(new Date()));
+
+        //1.通过接口获取数据
+        Long endTime = System.currentTimeMillis();
+        Long startTime = endTime - HzApiConf.INTERVAL_TIME;
+
+        IotDeviceInfo iotDeviceInfo = new IotDeviceInfo();
+        iotDeviceInfo.setDeviceName("配电箱");
+        iotDeviceInfo.setFactoryName("萨达");
+        List<IotDeviceInfo> iotDeviceInfos = iIotDeviceInfoService.selectIotDeviceInfoList(iotDeviceInfo);
+        iotDeviceInfos.forEach(item -> {
+            String res_str = HttpRequest.get(HzApiConf.SD_IOT_POWER_HOST + "/metric/box/"+item.getDeviceId())
+                    .execute().body();
+            JSONObject res = JSONObject.parseObject(res_str).getJSONObject("result");
+            // 电能检测数据
+            JSONObject metric = res.getJSONObject("metric");
+            // 温度检测数据
+            JSONArray temperatures = res.getJSONArray("temperatures");
+            // 漏电检测数据
+            JSONArray leakages = res.getJSONArray("leakages");
+            // 报警数据
+            JSONObject ticketStatus = res.getJSONObject("ticketStatus");
+            List<IotPower> iotPowers = new ArrayList<>(16);
+            List<IotWarningInfo> iotWarningInfos = new ArrayList<>(16);
+            IotPower iotPower = new IotPower();
+            iotPower.setUid(item.getDeviceId());
+            iotPower.setTime(DateUtils.getNowDate());
+            BigDecimal power = metric.getBigDecimal("power_a").add(metric.getBigDecimal("power_b")).add(metric.getBigDecimal("power_c"));
+            iotPower.setPower(power.divide(new BigDecimal(3), 2, BigDecimal.ROUND_HALF_UP));
+            int leak = 0;
+            for (int i = 0; i < leakages.size(); i++) {
+                JSONObject leakage = leakages.getJSONObject(i);
+                if(Convert.toInt(leakage.get("leakage"),0)>leak){
+                    leak = leakage.getInteger("leakage");
+                }
+            }
+            iotPower.setLeak(BigDecimal.valueOf(leak));
+            iotPower.setC1(BigDecimal.valueOf(metric.getFloat("current_a")));
+            iotPower.setC2(BigDecimal.valueOf(metric.getFloat("current_b")));
+            iotPower.setC3(BigDecimal.valueOf(metric.getFloat("current_c")));
+            iotPower.setV1(BigDecimal.valueOf(metric.getFloat("voltage_a")));
+            iotPower.setV2(BigDecimal.valueOf(metric.getFloat("voltage_b")));
+            iotPower.setV3(BigDecimal.valueOf(metric.getFloat("voltage_c")));
+            BigDecimal data = temperatures.getJSONObject(0).getBigDecimal("temperature");
+            iotPower.setT1(data);
+            iotPower.setT2(data);
+            iotPower.setT3(data);
+            iotPower.setT4(data);
+
+            // 预警数据
+            if (t % 2 == 0 && !warrning_power_sd[t]) {
+                warrning_power_sd = new Boolean[]{false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false};
+                warrning_power_sd[t] = true;
+
+                if(ticketStatus.getInteger("is_blackout")>0){
+                    IotWarningInfo iotWarningInfo = new IotWarningInfo();
+                    iotWarningInfo.setDeviceId(iotPower.getUid());
+                    iotWarningInfo.setType("断电预警");
+                    iotWarningInfo.setContent("设备触发断电，请排查异常情况");
+                    iotWarningInfo.setCreateTime(new Date());
+                    iotWarningInfos.add(iotWarningInfo);
+                }
+                if(ticketStatus.getInteger("is_smoke")>0){
+                    IotWarningInfo iotWarningInfo = new IotWarningInfo();
+                    iotWarningInfo.setDeviceId(iotPower.getUid());
+                    iotWarningInfo.setType("烟感报警");
+                    iotWarningInfo.setContent("设备烟感报警，请排查异常情况");
+                    iotWarningInfo.setCreateTime(new Date());
+                    iotWarningInfos.add(iotWarningInfo);
+                }
+                if(ticketStatus.getInteger("is_overload")>0){
+                    IotWarningInfo iotWarningInfo = new IotWarningInfo();
+                    iotWarningInfo.setDeviceId(iotPower.getUid());
+                    iotWarningInfo.setType("过载报警");
+                    iotWarningInfo.setContent("设备过载报警，请排查异常情况");
+                    iotWarningInfo.setCreateTime(new Date());
+                    iotWarningInfos.add(iotWarningInfo);
+                }
+                if(ticketStatus.getInteger("is_disconnect")>0){
+                    IotWarningInfo iotWarningInfo = new IotWarningInfo();
+                    iotWarningInfo.setDeviceId(iotPower.getUid());
+                    iotWarningInfo.setType("断开报警");
+                    iotWarningInfo.setContent("设备断开报警，请排查异常情况");
+                    iotWarningInfo.setCreateTime(new Date());
+                    iotWarningInfos.add(iotWarningInfo);
+                }
+                if(ticketStatus.getInteger("is_overheat")>0){
+                    IotWarningInfo iotWarningInfo = new IotWarningInfo();
+                    iotWarningInfo.setDeviceId(iotPower.getUid());
+                    iotWarningInfo.setType(" 高温报警");
+                    iotWarningInfo.setContent("设备高温报警，请排查异常情况");
+                    iotWarningInfo.setCreateTime(new Date());
+                    iotWarningInfos.add(iotWarningInfo);
+                }
+                if(ticketStatus.getInteger("is_leakage")>0){
+                    IotWarningInfo iotWarningInfo = new IotWarningInfo();
+                    iotWarningInfo.setDeviceId(iotPower.getUid());
+                    iotWarningInfo.setType(" 漏电报警");
+                    iotWarningInfo.setContent("设备漏电报警，请排查异常情况");
+                    iotWarningInfo.setCreateTime(new Date());
+                    iotWarningInfos.add(iotWarningInfo);
+                }
+            }
+
+            iotPowers.add(iotPower);
+
+            if (iotPowers.size() > 0) {
+                iotPowerService.batchInsertPower(iotPowers);
+            }
+            if (iotWarningInfos.size() > 0) {
+                iotWarningInfoService.batchInsertWarning(iotWarningInfos);
+            }
+        });
+    }
+}

mkl-iot/src/main/resources/mapper/iot/IotDeviceInfoMapper.xml

@@ -14,10 +14,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="typeName"    column="type_name"    />
         <result property="hzTenantId"    column="hz_tenant_id"    />
         <result property="hzProjectId"    column="hz_project_id"    />
+        <result property="factoryName"    column="factory_name"    />
+        <result property="companyName"    column="company_name"    />
+        <result property="projectName"    column="project_name"    />
     </resultMap>
 
     <sql id="selectIotDeviceInfoVo">
-        select id, device_id, device_name, state, project_id, points,type_name,hz_tenant_id,hz_project_id from iot_device_info
+        select id, device_id, device_name, state, project_id, points, type_name, hz_tenant_id, hz_project_id, factory_name, company_name, project_name from iot_device_info
     </sql>
 
     <select id="selectIotDeviceInfoList" parameterType="IotDeviceInfo" resultMap="IotDeviceInfoResult">
@@ -29,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and project_id = #{projectId}</if>
             <if test="points != null "> and points = #{points}</if>
             <if test="typeName != null "> and type_name = #{typeName}</if>
+            <if test="factoryName != null  and factoryName != ''"> and factory_name = #{factoryName}</if>
         </where>
     </select>
     

mkl-screen/pom.xml

@@ -29,7 +29,9 @@
         <dependency>
             <groupId>cc.casually</groupId>
             <artifactId>html-parse</artifactId>
-            <version>2.1.5</version>
+            <version>2.1.1</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}\libs\html-parse-2.1.1.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.ruoyi</groupId>

mkl-screen/src/main/java/com/ruoyi/weixin/controller/ApiEnvironmentController.java

@@ -9,7 +9,7 @@ import com.ruoyi.weixin.service.IEnvironmentService;
 import com.ruoyi.weixin.service.ISmzTeamLeaderNameService;
 import com.ruoyi.weixin.util.GetRequestJsonUtils;
 import org.apache.poi.ss.formula.functions.T;
-import org.omg.CORBA.OBJ_ADAPTER;
+//import org.omg.CORBA.OBJ_ADAPTER;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;

mkl-screen/src/main/java/com/ruoyi/weixin/controller/ScreenController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.weixin.controller;
 
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.controller.BaseController;

mkl-screen/src/main/java/com/ruoyi/weixin/service/impl/EnvironmentServiceImpl.java

@@ -14,8 +14,8 @@ import com.ruoyi.weixin.mapper.EnvironmentMapper;
 import com.ruoyi.weixin.service.IEnvironmentService;
 import com.ruoyi.weixin.util.RequestUtils;
 import org.jasig.cas.client.util.CommonUtils;
-import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.Request;
+//import org.omg.CORBA.MARSHAL;
+//import org.omg.CORBA.Request;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mkl-weiInfo/src/main/java/com/ruoyi/api/controller/ApiWeiController.java

@@ -2,12 +2,12 @@ package com.ruoyi.api.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.api.service.ApiService;
-import com.sun.org.apache.xpath.internal.operations.Mod;
+//import com.sun.org.apache.xpath.internal.operations.Mod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+//import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;

pom.xml

@@ -26,6 +26,7 @@
         <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
         <fastjson.version>1.2.76</fastjson.version>
+        <fastjson2.version>2.0.34</fastjson2.version>
         <oshi.version>5.7.4</oshi.version>
         <jna.version>5.8.0</jna.version>
         <commons.io.version>2.10.0</commons.io.version>
@@ -183,6 +184,12 @@
                 <version>${fastjson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.alibaba.fastjson2</groupId>
+                <artifactId>fastjson2</artifactId>
+                <version>${fastjson2.version}</version>
+            </dependency>
+
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -298,6 +305,13 @@
                 <artifactId>mkl-examine</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.7.32</version> <!-- 请检查是否有更新的版本 -->
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -308,6 +322,7 @@
         <module>ruoyi-quartz</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
+        <module>ruoyi-yanzhu</module>
         <module>mkl-business</module>
         <module>mkl-largeScreenApi</module>
         <module>mkl-building</module>
@@ -348,7 +363,7 @@
         <repository>
             <id>public</id>
             <name>aliyun nexus</name>
-            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -359,7 +374,7 @@
         <pluginRepository>
             <id>public</id>
             <name>aliyun nexus</name>
-            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
             <releases>
                 <enabled>true</enabled>
             </releases>

ruoyi-admin/pom.xml

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
+            <optional>true</optional>
         </dependency>
 
         <!-- swagger3-->
@@ -108,6 +108,8 @@
             <artifactId>mkl-screen</artifactId>
         </dependency>
 
+        <!-- 业务模块-->
+
         <dependency>
             <groupId>com.qcloud</groupId>
             <artifactId>cos_api</artifactId>
@@ -153,6 +155,15 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>mkl-examine</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-yanzhu</artifactId>
+            <version>4.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+        </dependency>
 
     </dependencies>
 
@@ -181,7 +192,14 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
                 </configuration>   
-            </plugin>   
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                </configuration>
+            </plugin>
             <!-- YUI Compressor (CSS/JS压缩) 
             <plugin>
                 <groupId>net.alchim31.maven</groupId>

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -3,17 +3,20 @@ package com.ruoyi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
 
 /**
  * 启动程序
  * 
  * @author ruoyi
  */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class },
+        scanBasePackages = {"com.yanzhu","com.ruoyi"})
 public class RuoYiApplication
 {
     public static void main(String[] args)
     {
+
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java

@@ -8,6 +8,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -52,7 +52,6 @@ public class SysDictDataController extends BaseController
         return getDataTable(list);
     }
 
-
     @PostMapping("/listData")
     @ResponseBody
     public TableDataInfo listData(SysDictData dictData)

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://127.0.0.1:3306/mkl_cas_v1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://62.234.3.186:3306/mkl_cas2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
                 username: root
-                password: root
+                password: Sxyanzhu@cf123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -76,7 +76,7 @@ spring:
 # MyBatis
 mybatis:
   # 搜索指定包别名
-  typeAliasesPackage: com.ruoyi.**.domain
+  typeAliasesPackage: com.ruoyi.**.domain,com.yanzhu.**.domain
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
@@ -143,7 +143,7 @@ swagger:
 cas:
   client-name: CasClientTYPT
   server:
-    url: http://localhost:8080/cas
+    url: http://62.234.3.186/cas
   project:
    url: http://127.0.0.1:9004
 # helmet文件下载路径路径配置
@@ -162,4 +162,7 @@ helmet:
 ## 定时任务基础配置
 scheduling:
   enabled: true   #定时任务开关
-#  enabled: false   #定时任务开关
+#  enabled: false   #定时任务开关
+vue:
+  #path: classpath:/yanzhuui/
+  path: file:D:\\hahaprj\\dapeng\\v4\mkl2\\yanzhu-ui\\dist\\

ruoyi-admin/src/main/resources/templates/index.html

@@ -89,7 +89,7 @@
             </div>
         </nav>
     </div>
-    <!--左侧导航开始-->
+    <!--左侧导航开始111-->
     <nav class="navbar-default navbar-static-side" role="navigation">
 
         <div class="sidebar-collapse">

ruoyi-common/pom.xml

@@ -16,7 +16,10 @@
     </description>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
         <!-- Spring框架基本的核心工具 -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -160,8 +163,10 @@
 
         <dependency>
             <groupId>com.aspose</groupId>
-            <artifactId>cells</artifactId>
+            <artifactId>aspose-cells</artifactId>
             <version>8.5.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}\libs\aspose-cells-8.5.2.jar</systemPath>
         </dependency>
 
         <dependency>

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -101,4 +101,5 @@ public class Constants
      * RMI 远程方法调用
      */
     public static final String LOOKUP_RMI = "rmi://";
+    public static final Integer BIGSCREEN_QUERY_CACHE = 1;
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -0,0 +1,268 @@
+package com.ruoyi.common.core.redis;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundSetOperations;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+
+/**
+ * spring redis 工具类
+ *
+ * @author ruoyi
+ **/
+@SuppressWarnings(value = { "unchecked", "rawtypes" })
+@Component
+public class RedisCache
+{
+    @Autowired
+    public RedisTemplate redisTemplate;
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key 缓存的键值
+     * @param value 缓存的值
+     */
+    public <T> void setCacheObject(final String key, final T value)
+    {
+        redisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key 缓存的键值
+     * @param value 缓存的值
+     * @param timeout 时间
+     * @param timeUnit 时间颗粒度
+     */
+    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
+    {
+        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key Redis键
+     * @param timeout 超时时间
+     * @return true=设置成功；false=设置失败
+     */
+    public boolean expire(final String key, final long timeout)
+    {
+        return expire(key, timeout, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key Redis键
+     * @param timeout 超时时间
+     * @param unit 时间单位
+     * @return true=设置成功；false=设置失败
+     */
+    public boolean expire(final String key, final long timeout, final TimeUnit unit)
+    {
+        return redisTemplate.expire(key, timeout, unit);
+    }
+
+    /**
+     * 获取有效时间
+     *
+     * @param key Redis键
+     * @return 有效时间
+     */
+    public long getExpire(final String key)
+    {
+        return redisTemplate.getExpire(key);
+    }
+
+    /**
+     * 判断 key是否存在
+     *
+     * @param key 键
+     * @return true 存在 false不存在
+     */
+    public Boolean hasKey(String key)
+    {
+        return redisTemplate.hasKey(key);
+    }
+
+    /**
+     * 获得缓存的基本对象。
+     *
+     * @param key 缓存键值
+     * @return 缓存键值对应的数据
+     */
+    public <T> T getCacheObject(final String key)
+    {
+        ValueOperations<String, T> operation = redisTemplate.opsForValue();
+        return operation.get(key);
+    }
+
+    /**
+     * 删除单个对象
+     *
+     * @param key
+     */
+    public boolean deleteObject(final String key)
+    {
+        return redisTemplate.delete(key);
+    }
+
+    /**
+     * 删除集合对象
+     *
+     * @param collection 多个对象
+     * @return
+     */
+    public boolean deleteObject(final Collection collection)
+    {
+        return redisTemplate.delete(collection) > 0;
+    }
+
+    /**
+     * 缓存List数据
+     *
+     * @param key 缓存的键值
+     * @param dataList 待缓存的List数据
+     * @return 缓存的对象
+     */
+    public <T> long setCacheList(final String key, final List<T> dataList)
+    {
+        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
+        return count == null ? 0 : count;
+    }
+
+    /**
+     * 获得缓存的list对象
+     *
+     * @param key 缓存的键值
+     * @return 缓存键值对应的数据
+     */
+    public <T> List<T> getCacheList(final String key)
+    {
+        return redisTemplate.opsForList().range(key, 0, -1);
+    }
+
+    /**
+     * 缓存Set
+     *
+     * @param key 缓存键值
+     * @param dataSet 缓存的数据
+     * @return 缓存数据的对象
+     */
+    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
+    {
+        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
+        Iterator<T> it = dataSet.iterator();
+        while (it.hasNext())
+        {
+            setOperation.add(it.next());
+        }
+        return setOperation;
+    }
+
+    /**
+     * 获得缓存的set
+     *
+     * @param key
+     * @return
+     */
+    public <T> Set<T> getCacheSet(final String key)
+    {
+        return redisTemplate.opsForSet().members(key);
+    }
+
+    /**
+     * 缓存Map
+     *
+     * @param key
+     * @param dataMap
+     */
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
+    {
+        if (dataMap != null) {
+            redisTemplate.opsForHash().putAll(key, dataMap);
+        }
+    }
+
+    /**
+     * 获得缓存的Map
+     *
+     * @param key
+     * @return
+     */
+    public <T> Map<String, T> getCacheMap(final String key)
+    {
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * 往Hash中存入数据
+     *
+     * @param key Redis键
+     * @param hKey Hash键
+     * @param value 值
+     */
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
+    {
+        redisTemplate.opsForHash().put(key, hKey, value);
+    }
+
+    /**
+     * 获取Hash中的数据
+     *
+     * @param key Redis键
+     * @param hKey Hash键
+     * @return Hash中的对象
+     */
+    public <T> T getCacheMapValue(final String key, final String hKey)
+    {
+        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
+        return opsForHash.get(key, hKey);
+    }
+
+    /**
+     * 获取多个Hash中的数据
+     *
+     * @param key Redis键
+     * @param hKeys Hash键集合
+     * @return Hash对象集合
+     */
+    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
+    {
+        return redisTemplate.opsForHash().multiGet(key, hKeys);
+    }
+
+    /**
+     * 删除Hash中的某条数据
+     *
+     * @param key Redis键
+     * @param hKey Hash键
+     * @return 是否成功
+     */
+    public boolean deleteCacheMapValue(final String key, final String hKey)
+    {
+        return redisTemplate.opsForHash().delete(key, hKey) > 0;
+    }
+
+    /**
+     * 获得缓存的基本对象列表
+     *
+     * @param pattern 字符串前缀
+     * @return 对象列表
+     */
+    public Collection<String> keys(final String pattern)
+    {
+        return redisTemplate.keys(pattern);
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -127,7 +127,7 @@ public class FileUploadUtils
         return fileName;
     }
 
-    private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
+    public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
     {
         File desc = new File(uploadDir + File.separator + fileName);
 
@@ -141,7 +141,7 @@ public class FileUploadUtils
         return desc;
     }
 
-    private static final String getPathFileName(String uploadDir, String fileName) throws IOException
+    public static final String getPathFileName(String uploadDir, String fileName) throws IOException
     {
         int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

@@ -1,15 +1,13 @@
 package com.ruoyi.common.utils.file;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.DateUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.utils.StringUtils;
 
@@ -77,7 +75,56 @@ public class FileUtils
             }
         }
     }
+    /**
+     * 获取图像后缀
+     *
+     * @param photoByte 图像数据
+     * @return 后缀名
+     */
+    public static String getFileExtendName(byte[] photoByte)
+    {
+        String strFileExtendName = "jpg";
+        if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
+                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
+        {
+            strFileExtendName = "gif";
+        }
+        else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
+        {
+            strFileExtendName = "jpg";
+        }
+        else if ((photoByte[0] == 66) && (photoByte[1] == 77))
+        {
+            strFileExtendName = "bmp";
+        }
+        else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
+        {
+            strFileExtendName = "png";
+        }
+        return strFileExtendName;
+    }
 
+    public static String writeBytes(byte[] data, String uploadDir,String fileName) throws IOException
+    {
+        FileOutputStream fos = null;
+        String pathName = "";
+        try
+        {
+            String extension = getFileExtendName(data);
+            pathName = DateUtils.datePath() + "/" + fileName;
+            File file = FileUploadUtils.getAbsoluteFile(uploadDir, pathName);
+            if(file.exists()){
+                file.delete();
+            }
+            fos = new FileOutputStream(file);
+            fos.write(data);
+        }
+        finally
+        {
+            IOUtils.close(fos);
+        }
+        return FileUploadUtils.getPathFileName(uploadDir, pathName);
+    }
     /**
      * 删除文件
      * 
@@ -200,4 +247,15 @@ public class FileUtils
         String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
         return encode.replaceAll("\\+", "%20");
     }
+
+    public static String getName(String fileName) {
+        if (fileName == null)
+        {
+            return null;
+        }
+        int lastUnixPos = fileName.lastIndexOf('/');
+        int lastWindowsPos = fileName.lastIndexOf('\\');
+        int index = Math.max(lastUnixPos, lastWindowsPos);
+        return fileName.substring(index + 1);
+    }
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java

@@ -1,6 +1,7 @@
 package com.ruoyi.framework.config;
 
 import org.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.annotation.MapperScans;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
@@ -14,6 +15,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 @EnableAspectJAutoProxy(exposeProxy = true)
 // 指定要扫描的Mapper类的包的路径
 @MapperScan("com.ruoyi.**.mapper")
+@MapperScan("com.yanzhu.**.mapper")
 public class ApplicationConfig
 {
 

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java

@@ -39,6 +39,7 @@ public class MyBatisConfig
 
     public static String setTypeAliasesPackage(String typeAliasesPackage)
     {
+        System.out.println("----->"+typeAliasesPackage);
         ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
         MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
         List<String> allResult = new ArrayList<String>();

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -36,15 +36,18 @@ public class ResourcesConfig implements WebMvcConfigurer
     {
         registry.addViewController("/").setViewName("forward:" + indexUrl);
     }
-
+    @Value("${vue.path}")
+    private String vuePath;
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry)
     {
+        System.out.println("--->vuePath:" + vuePath);
         /** 本地文件上传路径 */
         registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
 
         /** swagger配置 */
         registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
+        registry.addResourceHandler("/yanzhuui/**").addResourceLocations(vuePath);
     }
 
     /**

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java

@@ -348,6 +348,7 @@ public class ShiroConfig
     private void loadShiroFilterChain(ShiroFilterFactoryBean shiroFilterFactoryBean)
     {
         Map<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
+
         //开放接口
         filterChainDefinitionMap.put("/screen/**", "anon");
         filterChainDefinitionMap.put("/profile/**", "anon");
@@ -383,6 +384,8 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/components/**", "anon");
         filterChainDefinitionMap.put("/js/**", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");
+        filterChainDefinitionMap.put("/yanzhuui/**", "anon");
+        filterChainDefinitionMap.put("/mklapi/**", "anon");
         filterChainDefinitionMap.put("/images/**", "anon");
         filterChainDefinitionMap.put("/fonts/**", "anon");
         filterChainDefinitionMap.put("/fileimg.makalu.cc/**", "anon");
@@ -395,6 +398,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/system/alterationEndorseConfig/**", "anon");
         filterChainDefinitionMap.put("/mkl/api/queryEnvironment", "anon");
         filterChainDefinitionMap.put("/mkl/api/getWaringIngBaseInfo", "anon");
+        filterChainDefinitionMap.put("/mklApi/towerCrane/v1/push", "anon");
         filterChainDefinitionMap.put("/business/saftEducationOpenIdMap/**", "anon");
         filterChainDefinitionMap.put("/system/checkDutyUser/**", "anon");
         filterChainDefinitionMap.put("/system/saftcheckissue/**", "anon");

ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java

@@ -82,4 +82,9 @@ public class SysPasswordService
     {
         return new Md5Hash(loginName + password + salt).toHex();
     }
+
+    public static void main(String[] args){
+        String data="xdadminadmin123c73d0c";
+        System.out.println(new Md5Hash(data).toHex());
+    }
 }

ruoyi-yanzhu/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>4.6.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-yanzhu</artifactId>
+
+    <description>
+        system系统模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceCfgController.java

@@ -0,0 +1,119 @@
+package com.yanzhu.xd.system.controller;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceCfg;
+import com.yanzhu.xd.system.service.ISurProjectAttendanceCfgService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 考勤配置Controller
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+@Controller
+@RequestMapping("/mklapi/system/attendanceCfg")
+public class SurProjectAttendanceCfgController extends BaseController
+{
+    private String prefix = "system/attendanceCfg";
+
+    @Autowired
+    private ISurProjectAttendanceCfgService surProjectAttendanceCfgService;
+
+
+    @GetMapping()
+    public String attendanceCfg()
+    {
+        return prefix + "/attendanceCfg";
+    }
+
+    @GetMapping("/findAttendanceCfgList")
+    @ResponseBody
+    public AjaxResult findAttendanceCfgList(SurProjectAttendanceCfg surProjectAttendanceCfg)
+    {
+        List<SurProjectAttendanceCfg> list = surProjectAttendanceCfgService.selectSurProjectAttendanceCfgList(surProjectAttendanceCfg);
+        return AjaxResult.success(list);
+    }
+    /**
+     * 查询考勤配置列表
+     */
+
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SurProjectAttendanceCfg surProjectAttendanceCfg)
+    {
+        startPage();
+        List<SurProjectAttendanceCfg> list = surProjectAttendanceCfgService.selectSurProjectAttendanceCfgList(surProjectAttendanceCfg);
+        return getDataTable(list);
+    }
+
+    @GetMapping(value = "/{id}")
+    @ResponseBody
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success (surProjectAttendanceCfgService.selectSurProjectAttendanceCfgById(id));
+    }
+
+    /**
+     * 导出考勤配置列表
+     */
+
+    @Log(title = "考勤配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SurProjectAttendanceCfg surProjectAttendanceCfg)
+    {
+        List<SurProjectAttendanceCfg> list = surProjectAttendanceCfgService.selectSurProjectAttendanceCfgList(surProjectAttendanceCfg);
+        ExcelUtil<SurProjectAttendanceCfg> util = new ExcelUtil<SurProjectAttendanceCfg>(SurProjectAttendanceCfg.class);
+        return util.exportExcel(list, "考勤配置数据");
+    }
+
+
+
+    /**
+     * 新增保存考勤配置
+     */
+
+    @Log(title = "考勤配置", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SurProjectAttendanceCfg surProjectAttendanceCfg)
+    {
+        return toAjax(surProjectAttendanceCfgService.insertSurProjectAttendanceCfg(surProjectAttendanceCfg));
+    }
+
+
+
+    /**
+     * 修改保存考勤配置
+     */
+
+    @Log(title = "考勤配置", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(@RequestBody SurProjectAttendanceCfg surProjectAttendanceCfg)
+    {
+        return toAjax(surProjectAttendanceCfgService.updateSurProjectAttendanceCfg(surProjectAttendanceCfg));
+    }
+
+    /**
+     * 删除考勤配置
+     */
+
+    @Log(title = "考勤配置", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(Long[] ids)
+    {
+        return toAjax(surProjectAttendanceCfgService.deleteSurProjectAttendanceCfgByIds(ids));
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceDataController.java

@@ -0,0 +1,134 @@
+package com.yanzhu.xd.system.controller;
+
+import java.util.List;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceData;
+import com.yanzhu.xd.system.service.ISurProjectAttendanceDataService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 考勤数据Controller
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+@Controller
+@RequestMapping("/mklapi/system/attendanceData")
+public class SurProjectAttendanceDataController extends BaseController
+{
+    private String prefix = "system/attendanceData";
+
+    @Autowired
+    private ISurProjectAttendanceDataService surProjectAttendanceDataService;
+
+
+    @GetMapping()
+    public String attendanceData()
+    {
+        return prefix + "/attendanceData";
+    }
+
+    @GetMapping("/listEx")
+    @ResponseBody
+    public TableDataInfo listEx(SurProjectAttendanceData surProjectAttendanceData)
+    {
+        startPage();
+        String tmp=surProjectAttendanceData.getAttendanceTime();
+        if(StrUtil.isNotEmpty(tmp)){
+            int year= DateUtil.parse(tmp).year();
+            surProjectAttendanceData.setYear(year);
+        }
+        List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(surProjectAttendanceData);
+        return getDataTable(list);
+    }
+    /**
+     * 查询考勤数据列表
+     */
+
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SurProjectAttendanceData surProjectAttendanceData)
+    {
+        startPage();
+        List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(surProjectAttendanceData);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出考勤数据列表
+     */
+
+    @Log(title = "考勤数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SurProjectAttendanceData surProjectAttendanceData)
+    {
+        List<SurProjectAttendanceData> list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(surProjectAttendanceData);
+        ExcelUtil<SurProjectAttendanceData> util = new ExcelUtil<SurProjectAttendanceData>(SurProjectAttendanceData.class);
+        return util.exportExcel(list, "考勤数据数据");
+    }
+
+
+
+    /**
+     * 新增保存考勤数据
+     */
+
+    @Log(title = "考勤数据", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SurProjectAttendanceData surProjectAttendanceData)
+    {
+        return toAjax(surProjectAttendanceDataService.insertSurProjectAttendanceData(surProjectAttendanceData));
+    }
+
+    /**
+     * 修改考勤数据
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        SurProjectAttendanceData surProjectAttendanceData = surProjectAttendanceDataService.selectSurProjectAttendanceDataById(id);
+        mmap.put("surProjectAttendanceData", surProjectAttendanceData);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存考勤数据
+     */
+
+    @Log(title = "考勤数据", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SurProjectAttendanceData surProjectAttendanceData)
+    {
+        return toAjax(surProjectAttendanceDataService.updateSurProjectAttendanceData(surProjectAttendanceData));
+    }
+
+    /**
+     * 删除考勤数据
+     */
+
+    @Log(title = "考勤数据", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(Long[] ids)
+    {
+        return toAjax(surProjectAttendanceDataService.deleteSurProjectAttendanceDataByIds(ids));
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceGroupController.java

@@ -0,0 +1,116 @@
+package com.yanzhu.xd.system.controller;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceGroup;
+import com.yanzhu.xd.system.service.ISurProjectAttendanceGroupService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 班组信息Controller
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+@Controller
+@RequestMapping("/mklapi/system/attendanceGroup")
+public class SurProjectAttendanceGroupController extends BaseController
+{
+    private String prefix = "system/attendanceGroup";
+
+    @Autowired
+    private ISurProjectAttendanceGroupService surProjectAttendanceGroupService;
+
+    @GetMapping()
+    public String attendanceGroup()
+    {
+        return prefix + "/attendanceGroup";
+    }
+
+    /**
+     * 查询班组信息列表
+     */
+
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+        startPage();
+        List<SurProjectAttendanceGroup> list = surProjectAttendanceGroupService.selectSurProjectAttendanceGroupList(surProjectAttendanceGroup);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出班组信息列表
+     */
+
+    @Log(title = "班组信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+        List<SurProjectAttendanceGroup> list = surProjectAttendanceGroupService.selectSurProjectAttendanceGroupList(surProjectAttendanceGroup);
+        ExcelUtil<SurProjectAttendanceGroup> util = new ExcelUtil<SurProjectAttendanceGroup>(SurProjectAttendanceGroup.class);
+        return util.exportExcel(list, "班组信息数据");
+    }
+
+
+    /**
+     * 新增保存班组信息
+     */
+
+    @Log(title = "班组信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+        return toAjax(surProjectAttendanceGroupService.insertSurProjectAttendanceGroup(surProjectAttendanceGroup));
+    }
+
+    /**
+     * 修改班组信息
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        SurProjectAttendanceGroup surProjectAttendanceGroup = surProjectAttendanceGroupService.selectSurProjectAttendanceGroupById(id);
+        mmap.put("surProjectAttendanceGroup", surProjectAttendanceGroup);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存班组信息
+     */
+
+    @Log(title = "班组信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SurProjectAttendanceGroup surProjectAttendanceGroup)
+    {
+        return toAjax(surProjectAttendanceGroupService.updateSurProjectAttendanceGroup(surProjectAttendanceGroup));
+    }
+
+    /**
+     * 删除班组信息
+     */
+
+    @Log(title = "班组信息", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(Long[] ids)
+    {
+        return toAjax(surProjectAttendanceGroupService.deleteSurProjectAttendanceGroupByIds(ids));
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectAttendanceUserController.java

@@ -0,0 +1,133 @@
+package com.yanzhu.xd.system.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceUser;
+import com.yanzhu.xd.system.service.ISurProjectAttendanceUserService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 实名制人员Controller
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+@Controller
+@RequestMapping("/mklapi/system/attendanceUser")
+public class SurProjectAttendanceUserController extends BaseController
+{
+    private String prefix = "system/attendanceUser";
+
+    @Autowired
+    private ISurProjectAttendanceUserService surProjectAttendanceUserService;
+
+    @GetMapping()
+    public String attendanceUser()
+    {
+        return prefix + "/attendanceUser";
+    }
+
+    @GetMapping("/query")
+    @ResponseBody
+    public TableDataInfo query(SurProjectAttendanceUser surProjectAttendanceUser)
+    {
+        startPage();
+        List<SurProjectAttendanceUser> list = surProjectAttendanceUserService.querySurProjectAttendanceUserList(surProjectAttendanceUser);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/listjgw")
+    @ResponseBody
+    public TableDataInfo listjgw(SurProjectAttendanceUser surProjectAttendanceUser)
+    {
+        startPage();
+        List<SurProjectAttendanceUser> list = surProjectAttendanceUserService.selectSurProjectAttendanceUserListJgw(surProjectAttendanceUser);
+        return getDataTable(list);
+    }
+    /**
+     * 查询实名制人员列表
+     */
+
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SurProjectAttendanceUser surProjectAttendanceUser)
+    {
+        startPage();
+        List<SurProjectAttendanceUser> list = surProjectAttendanceUserService.selectSurProjectAttendanceUserList(surProjectAttendanceUser);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出实名制人员列表
+     */
+
+    @Log(title = "实名制人员", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SurProjectAttendanceUser surProjectAttendanceUser)
+    {
+        List<SurProjectAttendanceUser> list = surProjectAttendanceUserService.selectSurProjectAttendanceUserList(surProjectAttendanceUser);
+        ExcelUtil<SurProjectAttendanceUser> util = new ExcelUtil<SurProjectAttendanceUser>(SurProjectAttendanceUser.class);
+        return util.exportExcel(list, "实名制人员数据");
+    }
+
+    /**
+     * 新增保存实名制人员
+     */
+
+    @Log(title = "实名制人员", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SurProjectAttendanceUser surProjectAttendanceUser)
+    {
+        return toAjax(surProjectAttendanceUserService.insertSurProjectAttendanceUser(surProjectAttendanceUser));
+    }
+
+    /**
+     * 修改实名制人员
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        SurProjectAttendanceUser surProjectAttendanceUser = surProjectAttendanceUserService.selectSurProjectAttendanceUserById(id);
+        mmap.put("surProjectAttendanceUser", surProjectAttendanceUser);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存实名制人员
+     */
+
+    @Log(title = "实名制人员", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SurProjectAttendanceUser surProjectAttendanceUser)
+    {
+        return toAjax(surProjectAttendanceUserService.updateSurProjectAttendanceUser(surProjectAttendanceUser));
+    }
+
+    /**
+     * 删除实名制人员
+     */
+
+    @Log(title = "实名制人员", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(Long[] ids)
+    {
+        return toAjax(surProjectAttendanceUserService.deleteSurProjectAttendanceUserByIds(ids));
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurProjectController.java

@@ -0,0 +1,117 @@
+package com.yanzhu.xd.system.controller;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.yanzhu.xd.system.domain.SurProject;
+import com.yanzhu.xd.system.service.ISurProjectService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目Controller
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+@Controller
+@RequestMapping("/mklapi/system/project")
+public class SurProjectController extends BaseController
+{
+    private String prefix = "system/yzProject";
+
+    @Autowired
+    private ISurProjectService surProjectService;
+
+    @GetMapping()
+    public String yzProject()
+    {
+        return prefix + "/yzProject";
+    }
+
+    /**
+     * 查询项目列表
+     */
+
+    @GetMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SurProject surProject)
+    {
+        startPage();
+        List<SurProject> list = surProjectService.selectSurProjectList(surProject);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目列表
+     */
+
+    @Log(title = "项目", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SurProject surProject)
+    {
+        List<SurProject> list = surProjectService.selectSurProjectList(surProject);
+        ExcelUtil<SurProject> util = new ExcelUtil<SurProject>(SurProject.class);
+        return util.exportExcel(list, "项目数据");
+    }
+
+
+
+    /**
+     * 新增保存项目
+     */
+
+    @Log(title = "项目", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SurProject surProject)
+    {
+        return toAjax(surProjectService.insertSurProject(surProject));
+    }
+
+    /**
+     * 修改项目
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        SurProject surProject = surProjectService.selectSurProjectById(id);
+        mmap.put("surProject", surProject);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存项目
+     */
+
+    @Log(title = "项目", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SurProject surProject)
+    {
+        return toAjax(surProjectService.updateSurProject(surProject));
+    }
+
+    /**
+     * 删除项目
+     */
+
+    @Log(title = "项目", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(surProjectService.deleteSurProjectByIds(ids));
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/SurSysDictDataController.java

@@ -0,0 +1,37 @@
+package com.yanzhu.xd.system.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.system.service.ISysDictDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 数据字典信息
+ * 
+ * @author ruoyi
+ */
+@Controller
+@RequestMapping("/mklapi/system/dict/data")
+public class SurSysDictDataController extends BaseController
+{
+
+
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+
+
+
+    @GetMapping("/type/{dictType}")
+    @ResponseBody
+    public AjaxResult getDictype(@PathVariable("dictType") String dictType)
+    {
+        SysDictData where=new SysDictData();
+        where.setDictType(dictType);
+        return AjaxResult.success( dictDataService.selectDictDataList(where));
+    }
+
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/controller/TowerCraneApiController.java

@@ -0,0 +1,502 @@
+package com.yanzhu.xd.system.controller;
+
+import cn.hutool.http.HttpUtil;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import com.yanzhu.xd.system.domain.DevTowerProjectConfig;
+import com.yanzhu.xd.system.domain.TowerReqVo;
+import com.yanzhu.xd.system.emuns.TowerTypeEnums;
+import com.yanzhu.xd.system.service.IDevTowerProjectConfigService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 塔吊监测APIController
+ *
+ * @author JiangYuQi
+ * @date 2024-01-13
+ */
+@RestController
+@RequestMapping("/mklApi/towerCrane")
+public class TowerCraneApiController {
+
+    private static final Logger log = LoggerFactory.getLogger(TowerCraneApiController.class);
+
+    @Autowired
+    private IDevTowerProjectConfigService configService;
+
+    private final String HOST = "https://aqzg.makalu.cc";
+    private final String DEVSOURCE = "YF";
+
+    private Map<String, Object> cacheMap;
+
+    {
+        cacheMap = new HashMap<>();
+    }
+    /**
+     * 塔吊监测++
+     * 限流规则[60秒内最多请求10次，限流策略IP]
+     * @param req 请求信息
+     * @author JiangYuQi
+     * @date 2024-01-13
+     */
+    @PostMapping("/v1/push")
+    public AjaxResult pushData(@Validated @RequestBody TowerReqVo req) {
+        if(Objects.isNull(cacheMap.get("tower_cfg_"+req.getContent().getDeviceKey()))){
+            DevTowerProjectConfig config = configService.selectDevTowerProjectConfigBySn(req.getContent().getDeviceKey());
+            if(config==null){
+                throw new ServiceException("设备序列号错误，请联系管理员配置序列号...");
+            }
+            cacheMap.put("tower_cfg_"+req.getContent().getDeviceKey(),config);
+        }
+        if(req.getType() == TowerTypeEnums.BASE.getCode()){
+            this.pushConfigData(req);
+        }else if(req.getType() == TowerTypeEnums.RUN.getCode()){
+            this.pushRunData(req);
+        }else if(req.getType() == TowerTypeEnums.ROUND.getCode()){
+            this.pushRoundData(req);
+        }else if(req.getType() == TowerTypeEnums.COLLIDE.getCode()){
+            this.pushCollideData(req);
+        }else if(req.getType() == TowerTypeEnums.LIMIT.getCode()){
+            this.pushLimitData(req);
+        }else if(req.getType() == TowerTypeEnums.LOCAL.getCode()){
+            this.pushLocalData(req);
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 塔机上报基本信息
+     * @param req
+     */
+    private void pushConfigData(TowerReqVo req){
+        String sn = req.getContent().getDeviceKey();
+        Map<String, Object> dataContent = req.getContent().getDataContent();
+
+        //将数据同步至马卡鲁安管平台
+        Map<String, Object> dataMap = new HashMap<>();
+        dataMap.put("data_source",DEVSOURCE);
+        dataMap.put("device_sn",sn);
+        double rate = Convert.toInt(cacheMap.get("rate_"+sn),2);
+        dataMap.put("base",rate);
+        dataMap.put("coordX",dataContent.get("coordinateX"));
+        dataMap.put("coordY",dataContent.get("coordinateY"));
+        dataMap.put("foreArmLength",dataContent.get("frontBrachium"));
+        dataMap.put("postArmLength",dataContent.get("afterBrachium"));
+        dataMap.put("hatHeight",dataContent.get("towerCapHeight"));
+        double remotePullRod = Convert.toDouble(cacheMap.get("remotePullRod_"+sn),0.00);
+        double nearPullRod = Convert.toDouble(cacheMap.get("nearPullRod_"+sn),0.00);
+        double postPullRod = Convert.toDouble(cacheMap.get("postPullRod_"+sn),0.00);
+        dataMap.put("remotePullRod",remotePullRod);
+        dataMap.put("nearPullRod",nearPullRod);
+        dataMap.put("postPullRod",postPullRod);
+        dataMap.put("downHeight",dataContent.get("towerSectionHeight"));
+        dataMap.put("updateTime", DateUtils.getTime());
+
+        HttpUtil.post(HOST+"/api/device/baseInfo",dataMap,-1);
+    }
+
+    /**
+     * 塔机上报实时数据
+     * @param req
+     */
+    private void pushRunData(TowerReqVo req){
+        String sn = req.getContent().getDeviceKey();
+        Map<String, Object> dataContent = req.getContent().getDataContent();
+
+        // 将数据同步至马卡鲁安管平台
+        Map<String, Object> dataMap = new HashMap<>();
+        dataMap.put("data_source",DEVSOURCE);
+        dataMap.put("deviceSn",sn);
+        dataMap.put("thisTime",System.currentTimeMillis());
+        dataMap.put("weightData",dataContent.get("load"));
+        dataMap.put("tiltData",dataContent.get("leanAngleY"));
+        dataMap.put("windSpeedData",dataContent.get("windSpeed"));
+        String height = Convert.toStr(dataContent.get("height"));
+        dataMap.put("heightData",height);
+        dataMap.put("ampData",dataContent.get("range"));
+        dataMap.put("torqueData",dataContent.get("momentPercent"));
+        dataMap.put("angleData",dataContent.get("rotation"));
+        String dingShengData = Convert.toStr(cacheMap.get("highLimitWarning_"+sn),height);
+        dataMap.put("dingShengData",dingShengData);
+        dataMap.put("walkData",dataContent.get("range"));
+
+        // 将报警数据同步至马卡鲁安管平台
+        if(dataContent.get("warnings")!=null){
+            this.pushWarnData(req);
+        }
+        HttpUtil.post(HOST+"/api/device/runInfo",dataMap,-1);
+    }
+
+    /**
+     * 塔机上报循环数据
+     * @param req
+     */
+    private void pushRoundData(TowerReqVo req){
+        String sn = req.getContent().getDeviceKey();
+        Map<String, Object> dataContent = req.getContent().getDataContent();
+
+        // 将数据同步至马卡鲁安管平台
+        Map<String, Object> dataMap = new HashMap<>();
+        dataMap.put("data_source",DEVSOURCE);
+        dataMap.put("deviceSn",sn);
+        dataMap.put("dataId",System.currentTimeMillis());
+        dataMap.put("startTime",dataContent.get("workStartTime"));
+        dataMap.put("endTime",dataContent.get("workEndTime"));
+        dataMap.put("maxWeight",dataContent.get("maxLoad"));
+        dataMap.put("maxTorque",dataContent.get("maxMomentPercent"));
+        dataMap.put("maxHeight",dataContent.get("maxHeight"));
+        dataMap.put("minHeight",dataContent.get("minHeight"));
+        dataMap.put("maxAmptitude",dataContent.get("maxRange"));
+        dataMap.put("minAmptitude",dataContent.get("minRange"));
+        dataMap.put("maxRotateAngle",dataContent.get("endRotation"));
+        dataMap.put("minRotateAngle",dataContent.get("startRotation"));
+        dataMap.put("createTime",System.currentTimeMillis());
+
+        HttpUtil.post(HOST+"/api/device/roundInfo",dataMap,-1);
+    }
+
+    /**
+     * 塔机上报碰撞信息
+     * @param req
+     */
+    private void pushCollideData(TowerReqVo req){
+        String sn = req.getContent().getDeviceKey();
+
+        // 将数据同步至马卡鲁安管平台
+        Map<String, Object> dataMap = new HashMap<>();
+        dataMap.put("data_source",DEVSOURCE);
+        dataMap.put("deviceSn",sn);
+        dataMap.put("warn_name","none");
+
+        dataMap.put("warn_type","2");
+        dataMap.put("warn_context","注意碰撞！注意碰撞！");
+        dataMap.put("warn_note","注意碰撞！注意碰撞！");
+        dataMap.put("warn_data",Convert.toStr(cacheMap.get("collisionAngleAlarm_"+sn),"0"));
+        dataMap.put("real_data",Convert.toStr(cacheMap.get("collisionAngleAlarm_"+sn),"0"));
+        dataMap.put("warn_time",DateUtils.getTime());
+
+        HttpUtil.post(HOST+"/api/device/warnRecord",dataMap,-1);
+    }
+
+    /**
+     * 塔机推送预警信息
+     * @param req
+     */
+    private void pushWarnData(TowerReqVo req){
+        String sn = req.getContent().getDeviceKey();
+        Map<String, Object> dataContent = req.getContent().getDataContent();
+
+        // 将数据同步至马卡鲁安管平台
+        Map<String, Object> dataMap = new HashMap<>();
+        dataMap.put("data_source",DEVSOURCE);
+        dataMap.put("deviceSn",sn);
+        dataMap.put("warn_name","none");
+        if(dataContent.get("warnings")!=null){
+            List<String> warnings = (List<String>)dataContent.get("warnings");
+            for(String warning:warnings){
+                switch (warning){
+                    case "1":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","高限位");
+                        dataMap.put("warn_note","高限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("highLimitWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("highLimitWarning_"+sn),"0"));
+                        break;
+                    case "2":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","低限位");
+                        dataMap.put("warn_note","低限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("lowLimitWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("lowLimitWarning_"+sn),"0"));
+                        break;
+                    case "3":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","远方限位");
+                        dataMap.put("warn_note","远方限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("frontLimitWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("frontLimitWarning_"+sn),"0"));
+                        break;
+                    case "4":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","近方限位");
+                        dataMap.put("warn_note","近方限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("backLimitWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("backLimitWarning_"+sn),"0"));
+                        break;
+                    case "5":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","左转限位");
+                        dataMap.put("warn_note","左转限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("leftLimitWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("leftLimitWarning_"+sn),"0"));
+                        break;
+                    case "6":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","右转限位");
+                        dataMap.put("warn_note","右转限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("rightLimitWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("rightLimitWarning_"+sn),"0"));
+                        break;
+                    case "7":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","重量预警 1");
+                        dataMap.put("warn_note","重量预警 1");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("loadWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("loadWarning_"+sn),"0"));
+                        break;
+                    case "8":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","重量预警 2");
+                        dataMap.put("warn_note","重量预警 2");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("loadWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("loadWarning_"+sn),"0"));
+                        break;
+                    case "9":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","重量预警 3");
+                        dataMap.put("warn_note","重量预警 3");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("loadWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("loadWarning_"+sn),"0"));
+                        break;
+                    case "10":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","力矩预警 1");
+                        dataMap.put("warn_note","力矩预警 1");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("momentWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("momentWarning_"+sn),"0"));
+                        break;
+                    case "11":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","力矩预警 2");
+                        dataMap.put("warn_note","力矩预警 2");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("momentWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("momentWarning_"+sn),"0"));
+                        break;
+                    case "12":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","力矩预警 3");
+                        dataMap.put("warn_note","力矩预警 3");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("momentWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("momentWarning_"+sn),"0"));
+                        break;
+                    case "13":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","风速过大");
+                        dataMap.put("warn_note","风速过大");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("windSpeedWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("windSpeedWarning_"+sn),"0"));
+                        break;
+                    case "14":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","倾角过大");
+                        dataMap.put("warn_note","倾角过大");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("leanWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("leanWarning_"+sn),"0"));
+                        break;
+                    case "15":
+                        dataMap.put("warn_type","1");
+                        dataMap.put("warn_context","碰撞预警");
+                        dataMap.put("warn_note","碰撞预警");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("collisionDistanceWarning_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("collisionDistanceWarning_"+sn),"0"));
+                        break;
+                    case "101":
+                        dataMap.put("warn_type","2");
+                        dataMap.put("warn_context","高限位");
+                        dataMap.put("warn_note","高限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("highLimitAlarm_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("highLimitAlarm_"+sn),"0"));
+                        break;
+                    case "102":
+                        dataMap.put("warn_type","2");
+                        dataMap.put("warn_context","远方限位");
+                        dataMap.put("warn_note","远方限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("frontLimitAlarm_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("frontLimitAlarm_"+sn),"0"));
+                        break;
+                    case "103":
+                        dataMap.put("warn_type","2");
+                        dataMap.put("warn_context","近方限位");
+                        dataMap.put("warn_note","近方限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("backLimitAlarm_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("backLimitAlarm_"+sn),"0"));
+                        break;
+                    case "104":
+                        dataMap.put("warn_type","2");
+                        dataMap.put("warn_context","左转限位");
+                        dataMap.put("warn_note","左转限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("leftLimitAlarm_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("leftLimitAlarm_"+sn),"0"));
+                        break;
+                    case "105":
+                        dataMap.put("warn_type","2");
+                        dataMap.put("warn_context","右转限位");
+                        dataMap.put("warn_note","右转限位");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("rightLimitAlarm_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("rightLimitAlarm_"+sn),"0"));
+                        break;
+                    case "106":
+                        dataMap.put("warn_type","2");
+                        dataMap.put("warn_context","重量超重！重量限制最大值");
+                        dataMap.put("warn_note","重量超重！重量限制最大值");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("loadAlarm_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("loadAlarm_"+sn),"0"));
+                        break;
+                    case "107":
+                        dataMap.put("warn_type","2");
+                        dataMap.put("warn_context","力矩超载！力矩限制最大值");
+                        dataMap.put("warn_note","力矩超载！力矩限制最大值");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("momentAlarm_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("momentAlarm_"+sn),"0"));
+                        break;
+                    case "108":
+                        dataMap.put("warn_type","2");
+                        dataMap.put("warn_context","风速过大");
+                        dataMap.put("warn_note","风速过大");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("windSpeedAlarm_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("windSpeedAlarm_"+sn),"0"));
+                        break;
+                    case "109":
+                        dataMap.put("warn_type","2");
+                        dataMap.put("warn_context","倾角过大");
+                        dataMap.put("warn_note","倾角过大");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("leanAlarm_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("leanAlarm_"+sn),"0"));
+                        break;
+                    case "110":
+                        dataMap.put("warn_type","2");
+                        dataMap.put("warn_context","碰撞报警");
+                        dataMap.put("warn_note","碰撞报警");
+                        dataMap.put("warn_data",Convert.toStr(cacheMap.get("collisionDistanceAlarm_"+sn),"0"));
+                        dataMap.put("real_data",Convert.toStr(cacheMap.get("collisionDistanceAlarm_"+sn),"0"));
+                        break;
+                    case "201":
+                        dataMap.put("warn_type","3");
+                        dataMap.put("warn_context","风速仪数据异常");
+                        dataMap.put("warn_note","风速仪数据异常");
+                        break;
+                    case "202":
+                        dataMap.put("warn_type","3");
+                        dataMap.put("warn_context","高度数据异常");
+                        dataMap.put("warn_note","高度数据异常");
+                        break;
+                    case "203":
+                        dataMap.put("warn_type","3");
+                        dataMap.put("warn_context","幅度数据异常");
+                        dataMap.put("warn_note","幅度数据异常");
+                        break;
+                    case "204":
+                        dataMap.put("warn_type","3");
+                        dataMap.put("warn_context","回转数据异常");
+                        dataMap.put("warn_note","回转数据异常");
+                        break;
+                    case "205":
+                        dataMap.put("warn_type","3");
+                        dataMap.put("warn_context","重量数据异常");
+                        dataMap.put("warn_note","重量数据异常");
+                        break;
+                    case "207":
+                        dataMap.put("warn_type","3");
+                        dataMap.put("warn_context","力矩数据异常");
+                        dataMap.put("warn_note","力矩数据异常");
+                        break;
+                    case "208":
+                        dataMap.put("warn_type","3");
+                        dataMap.put("warn_context","人脸识别摄像头异常");
+                        dataMap.put("warn_note","人脸识别摄像头异常");
+                        break;
+                    case "301":
+                        dataMap.put("warn_type","3");
+                        dataMap.put("warn_context","抽烟警报");
+                        dataMap.put("warn_note","抽烟警报");
+                        break;
+                    case "302":
+                        dataMap.put("warn_type","3");
+                        dataMap.put("warn_context","打电话警报");
+                        dataMap.put("warn_note","打电话警报");
+                        break;
+                    case "303":
+                        dataMap.put("warn_type","3");
+                        dataMap.put("warn_context","疲劳警报");
+                        dataMap.put("warn_note","疲劳警报");
+                        break;
+                    default:
+                        dataMap.put("warn_type",null);
+                        break;
+                }
+                dataMap.put("warn_time",DateUtils.getTime());
+
+                if(Objects.nonNull(dataMap.get("warn_type"))){
+                    HttpUtil.post(HOST+"/api/device/warnRecord",dataMap,-1);
+                }
+            }
+        }
+    }
+
+    /**
+     * 塔机上报限位信息
+     * @param req
+     */
+    private void pushLimitData(TowerReqVo req){
+        System.out.println("d3==>pushLimitData");
+        String sn = req.getContent().getDeviceKey();
+        Map<String, Object> dataContent = req.getContent().getDataContent();
+
+        cacheMap.put("loadWarning_"+sn,dataContent.get("loadWarning"));
+        cacheMap.put("highLimitWarning_"+sn,dataContent.get("highLimitWarning"));
+        cacheMap.put("windSpeedWarning_"+sn,dataContent.get("windSpeedWarning"));
+        cacheMap.put("windSpeedAlarm_"+sn,dataContent.get("windSpeedAlarm"));
+        cacheMap.put("loadAlarm_"+sn,dataContent.get("loadAlarm"));
+        cacheMap.put("momentWarning_"+sn,dataContent.get("momentWarning"));
+        cacheMap.put("momentAlarm_"+sn,dataContent.get("momentAlarm"));
+        cacheMap.put("highLimitAlarm_"+sn,dataContent.get("highLimitAlarm"));
+        cacheMap.put("lowLimitWarning_"+sn,dataContent.get("lowLimitWarning"));
+        cacheMap.put("lowLimitAlarm_"+sn,dataContent.get("lowLimitAlarm"));
+        cacheMap.put("leftLimitWarning_"+sn,dataContent.get("leftLimitWarning"));
+        cacheMap.put("leftLimitAlarm_"+sn,dataContent.get("leftLimitAlarm"));
+        cacheMap.put("rightLimitWarning_"+sn,dataContent.get("rightLimitWarning"));
+        cacheMap.put("rightLimitAlarm_"+sn,dataContent.get("rightLimitAlarm"));
+        cacheMap.put("frontLimitWarning_"+sn,dataContent.get("frontLimitWarning"));
+        cacheMap.put("frontLimitAlarm_"+sn,dataContent.get("frontLimitAlarm"));
+        cacheMap.put("backLimitWarning_"+sn,dataContent.get("backLimitWarning"));
+        cacheMap.put("backLimitAlarm_"+sn,dataContent.get("backLimitAlarm"));
+        cacheMap.put("collisionAngleWarning_"+sn,dataContent.get("collisionAngleWarning"));
+        cacheMap.put("collisionAngleAlarm_"+sn,dataContent.get("collisionAngleAlarm"));
+        cacheMap.put("collisionDistanceWarning_"+sn,dataContent.get("collisionDistanceWarning"));
+        cacheMap.put("collisionDistanceAlarm_"+sn,dataContent.get("collisionDistanceAlarm"));
+        cacheMap.put("hDistanceWarning_"+sn,dataContent.get("hDistanceWarning"));
+        cacheMap.put("hDistanceAlarm_"+sn,dataContent.get("hDistanceAlarm"));
+        cacheMap.put("vDistanceWarning_"+sn,dataContent.get("vDistanceWarning"));
+        cacheMap.put("vDistanceAlarm_"+sn,dataContent.get("vDistanceAlarm"));
+        cacheMap.put("leanWarning_"+sn,dataContent.get("leanWarning"));
+        cacheMap.put("leanAlarm_"+sn,dataContent.get("leanAlarm"));
+        cacheMap.put("rangeLimitStart_"+sn,dataContent.get("rangeLimitStart"));
+        cacheMap.put("rangeLimitEnd_"+sn,dataContent.get("rangeLimitEnd"));
+        cacheMap.put("heightLimitStart_"+sn,dataContent.get("heightLimitStart"));
+        cacheMap.put("heightLimitEnd_"+sn,dataContent.get("heightLimitEnd"));
+        cacheMap.put("rotationLimitStart_"+sn,dataContent.get("rotationLimitStart"));
+        cacheMap.put("rotationLimitEnd_"+sn,dataContent.get("rotationLimitEnd"));
+    }
+
+    /**
+     * 塔机上报标定位信息
+     * @param req
+     */
+    private void pushLocalData(TowerReqVo req){
+        log.info("pushLocalData...");
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/domain/DevTowerProjectConfig.java

@@ -0,0 +1,315 @@
+package com.yanzhu.xd.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 塔基检测配置对象 dev_tower_project_config
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public class DevTowerProjectConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 项目主键 */
+    private Long projectId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 设备序列号 */
+    @Excel(name = "设备序列号")
+    private String deviceSn;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 设备来源 */
+    @Excel(name = "设备来源")
+    private String deviceSource;
+
+    /** 塔机编号 */
+    @Excel(name = "塔机编号")
+    private String towerId;
+
+    /** 塔机类型 */
+    @Excel(name = "塔机类型")
+    private String towerType;
+
+    /** 塔机坐标x */
+    @Excel(name = "塔机坐标x")
+    private String coordinateX;
+
+    /** 塔机坐标y */
+    @Excel(name = "塔机坐标y")
+    private String coordinateY;
+
+    /** 前臂长度 */
+    @Excel(name = "前臂长度")
+    private String frontBrachium;
+
+    /** 平衡臂长度 */
+    @Excel(name = "平衡臂长度")
+    private String afterBrachium;
+
+    /** 塔身高度 */
+    @Excel(name = "塔身高度")
+    private String towerBodyHeight;
+
+    /** 塔帽高度 */
+    @Excel(name = "塔帽高度")
+    private String towerCapHeight;
+
+    /** 塔节高度 */
+    @Excel(name = "塔节高度")
+    private String towerSectionHeight;
+
+    /** 设备状态 */
+    @Excel(name = "设备状态")
+    private String online;
+
+    /** 司机名称 */
+    @Excel(name = "司机名称")
+    private String driName;
+
+    /** 司机电话 */
+    @Excel(name = "司机电话")
+    private String driPhone;
+
+    /** 安全员名称 */
+    @Excel(name = "安全员名称")
+    private String safName;
+
+    /** 安全员电话 */
+    @Excel(name = "安全员电话")
+    private String safPhone;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Long isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setProjectId(Long projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId() 
+    {
+        return projectId;
+    }
+
+    public void setDeviceSn(String deviceSn) 
+    {
+        this.deviceSn = deviceSn;
+    }
+
+    public String getDeviceSn() 
+    {
+        return deviceSn;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public void setDeviceSource(String deviceSource)
+    {
+        this.deviceSource = deviceSource;
+    }
+
+    public String getDeviceSource() 
+    {
+        return deviceSource;
+    }
+
+    public String getTowerId() {
+        return towerId;
+    }
+
+    public void setTowerId(String towerId) {
+        this.towerId = towerId;
+    }
+
+    public void setTowerType(String towerType)
+    {
+        this.towerType = towerType;
+    }
+
+    public String getTowerType() 
+    {
+        return towerType;
+    }
+    public void setCoordinateX(String coordinateX) 
+    {
+        this.coordinateX = coordinateX;
+    }
+
+    public String getCoordinateX() 
+    {
+        return coordinateX;
+    }
+    public void setCoordinateY(String coordinateY) 
+    {
+        this.coordinateY = coordinateY;
+    }
+
+    public String getCoordinateY() 
+    {
+        return coordinateY;
+    }
+    public void setFrontBrachium(String frontBrachium) 
+    {
+        this.frontBrachium = frontBrachium;
+    }
+
+    public String getFrontBrachium() 
+    {
+        return frontBrachium;
+    }
+    public void setAfterBrachium(String afterBrachium) 
+    {
+        this.afterBrachium = afterBrachium;
+    }
+
+    public String getAfterBrachium() 
+    {
+        return afterBrachium;
+    }
+    public void setTowerBodyHeight(String towerBodyHeight) 
+    {
+        this.towerBodyHeight = towerBodyHeight;
+    }
+
+    public String getTowerBodyHeight() 
+    {
+        return towerBodyHeight;
+    }
+    public void setTowerCapHeight(String towerCapHeight) 
+    {
+        this.towerCapHeight = towerCapHeight;
+    }
+
+    public String getTowerCapHeight() 
+    {
+        return towerCapHeight;
+    }
+    public void setTowerSectionHeight(String towerSectionHeight) 
+    {
+        this.towerSectionHeight = towerSectionHeight;
+    }
+
+    public String getTowerSectionHeight() 
+    {
+        return towerSectionHeight;
+    }
+
+    public String getOnline() {
+        return online;
+    }
+
+    public void setOnline(String online) {
+        this.online = online;
+    }
+
+    public String getDriName() {
+        return driName;
+    }
+
+    public void setDriName(String driName) {
+        this.driName = driName;
+    }
+
+    public String getDriPhone() {
+        return driPhone;
+    }
+
+    public void setDriPhone(String driPhone) {
+        this.driPhone = driPhone;
+    }
+
+    public String getSafName() {
+        return safName;
+    }
+
+    public void setSafName(String safName) {
+        this.safName = safName;
+    }
+
+    public String getSafPhone() {
+        return safPhone;
+    }
+
+    public void setSafPhone(String safPhone) {
+        this.safPhone = safPhone;
+    }
+
+    public void setIsDel(Long isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("deviceSn", getDeviceSn())
+            .append("deviceName", getDeviceName())
+            .append("deviceSource", getDeviceSource())
+            .append("towerType", getTowerType())
+            .append("coordinateX", getCoordinateX())
+            .append("coordinateY", getCoordinateY())
+            .append("frontBrachium", getFrontBrachium())
+            .append("afterBrachium", getAfterBrachium())
+            .append("towerBodyHeight", getTowerBodyHeight())
+            .append("towerCapHeight", getTowerCapHeight())
+            .append("towerSectionHeight", getTowerSectionHeight())
+            .append("online", getOnline())
+            .append("driName", getDriName())
+            .append("driPhone", getDriPhone())
+            .append("safName", getSafName())
+            .append("safPhone", getSafPhone())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/domain/SurProject.java

@@ -0,0 +1,602 @@
+package com.yanzhu.xd.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目对象 sur_project
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public class SurProject extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 所属单位 */
+    @Excel(name = "所属单位")
+    private Long deptId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String projectCode;
+
+    /** 父级项目名称 */
+    @Excel(name = "父级项目名称")
+    private String paretProjectName;
+
+    /** 父级项目编号 */
+    @Excel(name = "父级项目编号")
+    private String paretProjectCode;
+
+    /** 项目简称 */
+    @Excel(name = "项目简称")
+    private String simpleName;
+
+    /** 项目类型 */
+    @Excel(name = "项目类型")
+    private String projectType;
+
+    /** 项目等级 */
+    @Excel(name = "项目等级")
+    private String projiectLevel;
+
+    /** 项目区县 */
+    @Excel(name = "项目区县")
+    private String projectRegional;
+
+    /** 项目地址 */
+    @Excel(name = "项目地址")
+    private String projectAddress;
+
+    /** 项目建设属性 */
+    @Excel(name = "项目建设属性")
+    private String projectNature;
+
+    /** 许可证号 */
+    @Excel(name = "许可证号")
+    private String licenceNumber;
+
+    /** 立项批文 */
+    @Excel(name = "立项批文")
+    private String projectApproval;
+
+    /** 项目负责人 */
+    @Excel(name = "项目负责人")
+    private String projectPerson;
+
+    /** 负责人电话 */
+    @Excel(name = "负责人电话")
+    private String projectPhone;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String latitude;
+
+    /** 项目工期 */
+    @Excel(name = "项目工期")
+    private Long projectTimeLimit;
+
+    /** 总投资 */
+    @Excel(name = "总投资")
+    private String totalInvestment;
+
+    /** 建筑面积 */
+    @Excel(name = "建筑面积")
+    private String floorArea;
+
+    /** 开累产值 */
+    @Excel(name = "开累产值")
+    private String totalOutputValue;
+
+    /** 计划完工时间 */
+    @Excel(name = "计划完工时间")
+    private String plannedCompletionTime;
+
+    /** 计划开始时间 */
+    @Excel(name = "计划开始时间")
+    private String scheduledStartTime;
+
+    /** 实际开始时间 */
+    @Excel(name = "实际开始时间")
+    private String actualOperatingTime;
+
+    /** 实际完工时间 */
+    @Excel(name = "实际完工时间")
+    private String actualCompletionTime;
+
+    /** 合同总金额 */
+    @Excel(name = "合同总金额")
+    private String contractAmount;
+
+    /** 已支付金额 */
+    @Excel(name = "已支付金额")
+    private String paidAmount;
+
+    /** 挂账金额 */
+    @Excel(name = "挂账金额")
+    private String onAccountAmount;
+
+    /** 项目进度 */
+    @Excel(name = "项目进度")
+    private String projectSchedule;
+
+    /** 项目概述 */
+    @Excel(name = "项目概述")
+    private String projectSummarize;
+
+    /** 基坑平面图 */
+    @Excel(name = "基坑平面图")
+    private String prjPlanUrl;
+
+    /** 效果图 */
+    @Excel(name = "效果图")
+    private String prjRenderingUrl;
+
+    /** 删除标识 */
+    @Excel(name = "删除标识")
+    private Long isDel;
+
+    /** 项目状态 */
+    @Excel(name = "项目状态")
+    private String projectStatus;
+
+    /** 劳务人员数 */
+    @Excel(name = "劳务人员数")
+    private Long servicePersonnel;
+
+    /** 监理人员数 */
+    @Excel(name = "监理人员数")
+    private Long supervisorPersonnel;
+
+    /** 总包人员数 */
+    @Excel(name = "总包人员数")
+    private Long generalContractor;
+
+    /** 重要级别 */
+    @Excel(name = "重要级别")
+    private String weightType;
+
+    /** 项目排序 */
+    @Excel(name = "项目排序")
+    private Long projectSort;
+
+    /** 进度显示（大屏使用） */
+    @Excel(name = "进度显示", readConverterExp = "大=屏使用")
+    private String progressVisible;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setProjectName(String projectName) 
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName() 
+    {
+        return projectName;
+    }
+    public void setProjectCode(String projectCode) 
+    {
+        this.projectCode = projectCode;
+    }
+
+    public String getProjectCode() 
+    {
+        return projectCode;
+    }
+    public void setParetProjectName(String paretProjectName) 
+    {
+        this.paretProjectName = paretProjectName;
+    }
+
+    public String getParetProjectName() 
+    {
+        return paretProjectName;
+    }
+    public void setParetProjectCode(String paretProjectCode) 
+    {
+        this.paretProjectCode = paretProjectCode;
+    }
+
+    public String getParetProjectCode() 
+    {
+        return paretProjectCode;
+    }
+    public void setSimpleName(String simpleName) 
+    {
+        this.simpleName = simpleName;
+    }
+
+    public String getSimpleName() 
+    {
+        return simpleName;
+    }
+    public void setProjectType(String projectType) 
+    {
+        this.projectType = projectType;
+    }
+
+    public String getProjectType() 
+    {
+        return projectType;
+    }
+    public void setProjiectLevel(String projiectLevel) 
+    {
+        this.projiectLevel = projiectLevel;
+    }
+
+    public String getProjiectLevel() 
+    {
+        return projiectLevel;
+    }
+    public void setProjectRegional(String projectRegional) 
+    {
+        this.projectRegional = projectRegional;
+    }
+
+    public String getProjectRegional() 
+    {
+        return projectRegional;
+    }
+    public void setProjectAddress(String projectAddress) 
+    {
+        this.projectAddress = projectAddress;
+    }
+
+    public String getProjectAddress() 
+    {
+        return projectAddress;
+    }
+    public void setProjectNature(String projectNature) 
+    {
+        this.projectNature = projectNature;
+    }
+
+    public String getProjectNature() 
+    {
+        return projectNature;
+    }
+    public void setLicenceNumber(String licenceNumber) 
+    {
+        this.licenceNumber = licenceNumber;
+    }
+
+    public String getLicenceNumber() 
+    {
+        return licenceNumber;
+    }
+    public void setProjectApproval(String projectApproval) 
+    {
+        this.projectApproval = projectApproval;
+    }
+
+    public String getProjectApproval() 
+    {
+        return projectApproval;
+    }
+    public void setProjectPerson(String projectPerson) 
+    {
+        this.projectPerson = projectPerson;
+    }
+
+    public String getProjectPerson() 
+    {
+        return projectPerson;
+    }
+    public void setProjectPhone(String projectPhone) 
+    {
+        this.projectPhone = projectPhone;
+    }
+
+    public String getProjectPhone() 
+    {
+        return projectPhone;
+    }
+    public void setLongitude(String longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public String getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(String latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public String getLatitude() 
+    {
+        return latitude;
+    }
+    public void setProjectTimeLimit(Long projectTimeLimit) 
+    {
+        this.projectTimeLimit = projectTimeLimit;
+    }
+
+    public Long getProjectTimeLimit() 
+    {
+        return projectTimeLimit;
+    }
+    public void setTotalInvestment(String totalInvestment) 
+    {
+        this.totalInvestment = totalInvestment;
+    }
+
+    public String getTotalInvestment() 
+    {
+        return totalInvestment;
+    }
+    public void setFloorArea(String floorArea) 
+    {
+        this.floorArea = floorArea;
+    }
+
+    public String getFloorArea() 
+    {
+        return floorArea;
+    }
+    public void setTotalOutputValue(String totalOutputValue) 
+    {
+        this.totalOutputValue = totalOutputValue;
+    }
+
+    public String getTotalOutputValue() 
+    {
+        return totalOutputValue;
+    }
+    public void setPlannedCompletionTime(String plannedCompletionTime) 
+    {
+        this.plannedCompletionTime = plannedCompletionTime;
+    }
+
+    public String getPlannedCompletionTime() 
+    {
+        return plannedCompletionTime;
+    }
+    public void setScheduledStartTime(String scheduledStartTime) 
+    {
+        this.scheduledStartTime = scheduledStartTime;
+    }
+
+    public String getScheduledStartTime() 
+    {
+        return scheduledStartTime;
+    }
+    public void setActualOperatingTime(String actualOperatingTime) 
+    {
+        this.actualOperatingTime = actualOperatingTime;
+    }
+
+    public String getActualOperatingTime() 
+    {
+        return actualOperatingTime;
+    }
+    public void setActualCompletionTime(String actualCompletionTime) 
+    {
+        this.actualCompletionTime = actualCompletionTime;
+    }
+
+    public String getActualCompletionTime() 
+    {
+        return actualCompletionTime;
+    }
+    public void setContractAmount(String contractAmount) 
+    {
+        this.contractAmount = contractAmount;
+    }
+
+    public String getContractAmount() 
+    {
+        return contractAmount;
+    }
+    public void setPaidAmount(String paidAmount) 
+    {
+        this.paidAmount = paidAmount;
+    }
+
+    public String getPaidAmount() 
+    {
+        return paidAmount;
+    }
+    public void setOnAccountAmount(String onAccountAmount) 
+    {
+        this.onAccountAmount = onAccountAmount;
+    }
+
+    public String getOnAccountAmount() 
+    {
+        return onAccountAmount;
+    }
+    public void setProjectSchedule(String projectSchedule) 
+    {
+        this.projectSchedule = projectSchedule;
+    }
+
+    public String getProjectSchedule() 
+    {
+        return projectSchedule;
+    }
+    public void setProjectSummarize(String projectSummarize) 
+    {
+        this.projectSummarize = projectSummarize;
+    }
+
+    public String getProjectSummarize() 
+    {
+        return projectSummarize;
+    }
+    public void setPrjPlanUrl(String prjPlanUrl) 
+    {
+        this.prjPlanUrl = prjPlanUrl;
+    }
+
+    public String getPrjPlanUrl() 
+    {
+        return prjPlanUrl;
+    }
+    public void setPrjRenderingUrl(String prjRenderingUrl) 
+    {
+        this.prjRenderingUrl = prjRenderingUrl;
+    }
+
+    public String getPrjRenderingUrl() 
+    {
+        return prjRenderingUrl;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+    public void setProjectStatus(String projectStatus) 
+    {
+        this.projectStatus = projectStatus;
+    }
+
+    public String getProjectStatus() 
+    {
+        return projectStatus;
+    }
+    public void setServicePersonnel(Long servicePersonnel) 
+    {
+        this.servicePersonnel = servicePersonnel;
+    }
+
+    public Long getServicePersonnel() 
+    {
+        return servicePersonnel;
+    }
+    public void setSupervisorPersonnel(Long supervisorPersonnel) 
+    {
+        this.supervisorPersonnel = supervisorPersonnel;
+    }
+
+    public Long getSupervisorPersonnel() 
+    {
+        return supervisorPersonnel;
+    }
+    public void setGeneralContractor(Long generalContractor) 
+    {
+        this.generalContractor = generalContractor;
+    }
+
+    public Long getGeneralContractor() 
+    {
+        return generalContractor;
+    }
+    public void setWeightType(String weightType) 
+    {
+        this.weightType = weightType;
+    }
+
+    public String getWeightType() 
+    {
+        return weightType;
+    }
+    public void setProjectSort(Long projectSort) 
+    {
+        this.projectSort = projectSort;
+    }
+
+    public Long getProjectSort() 
+    {
+        return projectSort;
+    }
+    public void setProgressVisible(String progressVisible) 
+    {
+        this.progressVisible = progressVisible;
+    }
+
+    public String getProgressVisible() 
+    {
+        return progressVisible;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("deptId", getDeptId())
+            .append("projectName", getProjectName())
+            .append("projectCode", getProjectCode())
+            .append("paretProjectName", getParetProjectName())
+            .append("paretProjectCode", getParetProjectCode())
+            .append("simpleName", getSimpleName())
+            .append("projectType", getProjectType())
+            .append("projiectLevel", getProjiectLevel())
+            .append("projectRegional", getProjectRegional())
+            .append("projectAddress", getProjectAddress())
+            .append("projectNature", getProjectNature())
+            .append("licenceNumber", getLicenceNumber())
+            .append("projectApproval", getProjectApproval())
+            .append("projectPerson", getProjectPerson())
+            .append("projectPhone", getProjectPhone())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("projectTimeLimit", getProjectTimeLimit())
+            .append("totalInvestment", getTotalInvestment())
+            .append("floorArea", getFloorArea())
+            .append("totalOutputValue", getTotalOutputValue())
+            .append("plannedCompletionTime", getPlannedCompletionTime())
+            .append("scheduledStartTime", getScheduledStartTime())
+            .append("actualOperatingTime", getActualOperatingTime())
+            .append("actualCompletionTime", getActualCompletionTime())
+            .append("contractAmount", getContractAmount())
+            .append("paidAmount", getPaidAmount())
+            .append("onAccountAmount", getOnAccountAmount())
+            .append("projectSchedule", getProjectSchedule())
+            .append("projectSummarize", getProjectSummarize())
+            .append("prjPlanUrl", getPrjPlanUrl())
+            .append("prjRenderingUrl", getPrjRenderingUrl())
+            .append("isDel", getIsDel())
+            .append("projectStatus", getProjectStatus())
+            .append("servicePersonnel", getServicePersonnel())
+            .append("supervisorPersonnel", getSupervisorPersonnel())
+            .append("generalContractor", getGeneralContractor())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("weightType", getWeightType())
+            .append("projectSort", getProjectSort())
+            .append("progressVisible", getProgressVisible())
+            .toString();
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/domain/SurProjectAttendanceCfg.java

@@ -0,0 +1,181 @@
+package com.yanzhu.xd.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 考勤配置对象 sur_project_attendance_cfg
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public class SurProjectAttendanceCfg extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private Long projectId;
+
+    /** 总包单位 */
+    @Excel(name = "总包单位")
+    private Long subDeptId;
+
+    /** 厂商编号参考字典attendance_vendors */
+    @Excel(name = "厂商编号参考字典attendance_vendors")
+    private String vendorsCode;
+
+    /** 厂商参数 */
+    @Excel(name = "厂商参数")
+    private String vendorsParameter;
+
+    /** 1-启用,0-停用 */
+    @Excel(name = "1-启用,0-停用")
+    private Long enabled;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long state;
+
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    private String projectName;
+    private String unitName;
+
+    private String vendorName;
+
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public void setVendorName(String vendorName) {
+        this.vendorName = vendorName;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long isDel;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setProjectId(Long projectId)
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId()
+    {
+        return projectId;
+    }
+    public void setSubDeptId(Long subDeptId)
+    {
+        this.subDeptId = subDeptId;
+    }
+
+    public Long getSubDeptId()
+    {
+        return subDeptId;
+    }
+    public void setVendorsCode(String vendorsCode)
+    {
+        this.vendorsCode = vendorsCode;
+    }
+
+    public String getVendorsCode()
+    {
+        return vendorsCode;
+    }
+    public void setVendorsParameter(String vendorsParameter)
+    {
+        this.vendorsParameter = vendorsParameter;
+    }
+
+    public String getVendorsParameter()
+    {
+        return vendorsParameter;
+    }
+    public void setEnabled(Long enabled)
+    {
+        this.enabled = enabled;
+    }
+
+    public Long getEnabled()
+    {
+        return enabled;
+    }
+    public void setState(Long state)
+    {
+        this.state = state;
+    }
+
+    public Long getState()
+    {
+        return state;
+    }
+    public void setIsDel(Long isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel()
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("projectId", getProjectId())
+                .append("subDeptId", getSubDeptId())
+                .append("vendorsCode", getVendorsCode())
+                .append("vendorsParameter", getVendorsParameter())
+                .append("enabled", getEnabled())
+                .append("state", getState())
+                .append("remark", getRemark())
+                .append("isDel", getIsDel())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}
+
+

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/domain/SurProjectAttendanceData.java

@@ -0,0 +1,512 @@
+package com.yanzhu.xd.system.domain;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson2.JSONObject;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 考勤数据对象 sur_project_attendance_data
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public class SurProjectAttendanceData extends BaseEntity
+{
+    public SurProjectAttendanceData(){
+        this.year= DateTime.now().year();
+    }
+    private static final long serialVersionUID = 1L;
+
+    private int year;
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getWorkerName() {
+        return workerName;
+    }
+
+    public void setWorkerName(String workerName) {
+        this.workerName = workerName;
+    }
+
+    public String getWorkerPhoto() {
+        return workerPhoto;
+    }
+
+    public void setWorkerPhoto(String workerPhoto) {
+        this.workerPhoto = workerPhoto;
+    }
+
+    public Long getWorkerGender() {
+        return workerGender;
+    }
+
+    public void setWorkerGender(Long workerGender) {
+        this.workerGender = workerGender;
+    }
+
+    public Long getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(Long birthDate) {
+        this.birthDate = birthDate;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getWorkTypeName() {
+        return workTypeName;
+    }
+
+    public void setWorkTypeName(String workTypeName) {
+        this.workTypeName = workTypeName;
+    }
+
+    public String getEthnic() {
+        return ethnic;
+    }
+
+    public void setEthnic(String ethnic) {
+        this.ethnic = ethnic;
+    }
+
+    public String getNativePlace() {
+        return nativePlace;
+    }
+
+    public void setNativePlace(String nativePlace) {
+        this.nativePlace = nativePlace;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Integer getSpecWorkType() {
+        return specWorkType;
+    }
+
+    public void setSpecWorkType(Integer specWorkType) {
+        this.specWorkType = specWorkType;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getAttendanceOutTime() {
+        return attendanceOutTime;
+    }
+
+    public void setAttendanceOutTime(String attendanceOutTime) {
+        this.attendanceOutTime = attendanceOutTime;
+    }
+
+
+    private Long projectId;
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    private Long deptId;
+    @Excel(name = "部门名称")
+    private String deptName;
+    @Excel(name = "姓名")
+    private String workerName;
+
+    private String workerPhoto;
+    @Excel(name = "性别0:男 1:女")
+    private Long workerGender;
+
+    private Long birthDate;
+    @Excel(name = "所属班组")
+    private String groupName;
+    @Excel(name = "工种")
+    private String workTypeName;
+    @Excel(name = "民族")
+    private String ethnic;
+    @Excel(name = "籍贯")
+    private String nativePlace;
+
+    @Excel(name = "联系电话")
+    private String phone;
+    @Excel(name = "是否特殊工种")
+    private Integer specWorkType;
+
+    private String companyTypeId;
+    @Excel(name = "分包商名称")
+    private String companyName;
+
+    private String workerId;
+
+    /** 考勤时间yyyy-MM-dd HH:mm:ss */
+    @Excel(name = "考勤时间(进场)")
+    private String attendanceTime;
+
+    @Excel(name = "考勤时间(离开)")
+    private String attendanceOutTime;
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String identification;
+
+    /**  */
+    private Long id;
+
+    /** 配置项ID,可以获取项目ID和总包ID */
+    private Long cfgid;
+
+    /** 注册应用ID */
+    private String appId;
+
+    /** 厂商编号参考字典attendance_vendors */
+    private String vendorsCode;
+
+    /** 服务端ID */
+    private String serverid;
+
+    /** 队伍id */
+    private Long teamId;
+
+    /** 工种编码 */
+    private String workTypeCode;
+
+    /** 分包商id */
+    private String companyId;
+
+    /** 平台对应分包商ID */
+    private Long vendorId;
+
+    /** 设备编号 */
+    private String deviceCode;
+
+    /** 照片 */
+    private String scanPhoto;
+
+    /**  */
+    private Long isDel;
+
+    private Long subDeptId;
+
+    /** 重要::yanzhu接口接收base64图片 */
+    private String scanPhotoBase64;
+
+    /** 重要::yanzhu出门进门逻辑判断 */
+    private String attendanceType;
+
+    public String getScanPhotoBase64() {
+        return scanPhotoBase64;
+    }
+
+    public void setScanPhotoBase64(String scanPhotoBase64) {
+        this.scanPhotoBase64 = scanPhotoBase64;
+    }
+
+    public String getAttendanceType() {
+        return attendanceType;
+    }
+
+    public void setAttendanceType(String attendanceType) {
+        this.attendanceType = attendanceType;
+    }
+
+    public static SurProjectAttendanceData createFromHuazhu(JSONObject j) {
+        SurProjectAttendanceData d=new SurProjectAttendanceData();
+        d.vendorsCode="huazhu";
+        d.serverid=j.getString("id");
+        d.workerId=j.getString("labourWorkerId");
+        long recordTime=j.getLongValue("recordTime",0);
+        if(recordTime>0){
+            if(j.getIntValue("inOrOut",1)==1){
+                d.setRemark("E");
+            }else{
+                d.setRemark("L");
+            }
+            d.attendanceTime= DateUtil.format(DateUtil.date(recordTime),"yyyy-MM-dd HH:mm:ss");
+        }
+        d.identification=j.getString("idCardNo");
+        d.teamId=j.getLongValue("teamId",0);
+        d.workTypeCode=j.getString("workerTypeId");
+        d.companyId=j.getString("unitId");
+        d.deviceCode=j.getString("deviceNo");
+        return  d;
+    }
+
+    public static SurProjectAttendanceData createFromJgw(JSONObject j) {
+        SurProjectAttendanceData d=new SurProjectAttendanceData();
+        d.vendorsCode="jgw";
+        d.serverid=j.getString("id");
+        d.workerId=j.getString("workerId");
+        if("2".equals(j.getString("machineType"))){
+            d.setRemark("E");
+        }else{
+            d.setRemark("L");
+        }
+        d.attendanceTime = j.getString("checkinTime");
+
+        d.teamId=0l;
+        d.workTypeCode="";
+        d.companyId=j.getString("subcontractorId");
+        d.deviceCode=j.getString("deviceSerialNo");
+        d.isDel=0l;
+        return  d;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    public Long getSubDeptId() {
+        return subDeptId;
+    }
+
+    public void setSubDeptId(Long subDeptId) {
+        this.subDeptId = subDeptId;
+    }
+
+    public String getCompanyTypeId() {
+        return companyTypeId;
+    }
+
+    public void setCompanyTypeId(String companyTypeId) {
+        this.companyTypeId = companyTypeId;
+    }
+
+    public static SurProjectAttendanceData create(JSONObject json) {
+        SurProjectAttendanceData d=new SurProjectAttendanceData();
+        d.attendanceTime=json.getString("time");
+        if("E".equals(json.getString("type"))){
+            d.setRemark("E");
+        }else{
+            d.setRemark("L");
+        }
+        d.serverid=json.getString("id");
+        d.workerId=json.getString("workerId");
+        d.identification=json.getString("identification");
+        d.teamId=json.getLong("teamId");
+        d.workTypeCode=json.getString("workerTypeId");
+        d.companyId=json.getString("companyId");
+        d.vendorId=json.getLong("vendorId");
+        d.deviceCode=json.getString("deviceCode");
+        d.scanPhoto=json.getString("scanPhoto");
+        d.isDel=0l;
+        return  d;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setCfgid(Long cfgid)
+    {
+        this.cfgid = cfgid;
+    }
+
+    public Long getCfgid()
+    {
+        return cfgid;
+    }
+    public void setVendorsCode(String vendorsCode)
+    {
+        this.vendorsCode = vendorsCode;
+    }
+
+    public String getVendorsCode()
+    {
+        return vendorsCode;
+    }
+    public void setServerid(String serverid)
+    {
+        this.serverid = serverid;
+    }
+
+    public String getServerid()
+    {
+        return serverid;
+    }
+    public void setWorkerId(String workerId)
+    {
+        this.workerId = workerId;
+    }
+
+    public String getWorkerId()
+    {
+        return workerId;
+    }
+
+    public void setAttendanceTime(String attendanceTime)
+    {
+        this.attendanceTime = attendanceTime;
+    }
+
+    public String getAttendanceTime()
+    {
+        return attendanceTime;
+    }
+    public void setIdentification(String identification)
+    {
+        this.identification = identification;
+    }
+
+    public String getIdentification()
+    {
+        return identification;
+    }
+    public void setTeamId(Long teamId)
+    {
+        this.teamId = teamId;
+    }
+
+    public Long getTeamId()
+    {
+        return teamId;
+    }
+    public void setWorkTypeCode(String workTypeCode)
+    {
+        this.workTypeCode = workTypeCode;
+    }
+
+    public String getWorkTypeCode()
+    {
+        return workTypeCode;
+    }
+    public void setCompanyId(String companyId)
+    {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyId()
+    {
+        return companyId;
+    }
+    public void setVendorId(Long vendorId)
+    {
+        this.vendorId = vendorId;
+    }
+
+    public Long getVendorId()
+    {
+        return vendorId;
+    }
+
+    public void setDeviceCode(String deviceCode)
+    {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceCode()
+    {
+        return deviceCode;
+    }
+
+
+    public void setScanPhoto(String scanPhoto)
+    {
+        this.scanPhoto = scanPhoto;
+    }
+
+    public String getScanPhoto()
+    {
+        return scanPhoto;
+    }
+
+    public void setIsDel(Long isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel()
+    {
+        return isDel;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("cfgid", getCfgid())
+                .append("vendorsCode", getVendorsCode())
+                .append("serverid", getServerid())
+                .append("workerId", getWorkerId())
+                .append("attendanceTime", getAttendanceTime())
+                .append("identification", getIdentification())
+                .append("teamId", getTeamId())
+                .append("workTypeCode", getWorkTypeCode())
+                .append("companyId", getCompanyId())
+                .append("vendorId", getVendorId())
+                .append("deviceCode", getDeviceCode())
+                .append("scanPhoto", getScanPhoto())
+                .append("remark", getRemark())
+                .append("isDel", getIsDel())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/domain/SurProjectAttendanceGroup.java

@@ -0,0 +1,430 @@
+package com.yanzhu.xd.system.domain;
+
+import com.alibaba.fastjson2.JSONObject;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 班组信息对象 sur_project_attendance_group
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public class SurProjectAttendanceGroup extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** cfgid */
+    @Excel(name = "cfgid")
+    private Long cfgid;
+
+    /** 注册应用ID */
+    @Excel(name = "注册应用ID")
+    private String appId;
+
+    /** 服务器主键id */
+    @Excel(name = "服务器主键id")
+    private String serverid;
+
+    /** 营业执照号 */
+    @Excel(name = "营业执照号")
+    private String bizLicense;
+
+    /** 分包商统一社会信用代码 */
+    @Excel(name = "分包商统一社会信用代码")
+    private String companyCode;
+
+    /** 分包商ID */
+    @Excel(name = "分包商ID")
+    private String companyId;
+
+    /** 分包商名称 */
+    @Excel(name = "分包商名称")
+    private String companyName;
+
+    /** 分包商类型 */
+    @Excel(name = "分包商类型")
+    private String companyTypeId;
+
+    /** 平台对应分包商ID */
+    @Excel(name = "平台对应分包商ID")
+    private Long vendorId;
+
+    /** 班组名称 */
+    @Excel(name = "班组名称")
+    private String name;
+
+    /** 班组长名称 */
+    @Excel(name = "班组长名称")
+    private String leaderName;
+
+    /** 班组长电话 */
+    @Excel(name = "班组长电话")
+    private String leaderPhone;
+
+    /** 队伍Id */
+    @Excel(name = "队伍Id")
+    private Long teamId;
+
+    /** 队伍名称 */
+    @Excel(name = "队伍名称")
+    private String teamName;
+
+    /** 班组类型0:建筑工人班组;1:管理人员班组 */
+    @Excel(name = "班组类型0:建筑工人班组;1:管理人员班组")
+    private Long type;
+
+    /** 班组长对应的工人ID */
+    @Excel(name = "班组长对应的工人ID")
+    private Long leaderId;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private Integer deleted;
+
+    /** 基础平台对应班组ID */
+    @Excel(name = "基础平台对应班组ID")
+    private Long platformGroupId;
+
+    /** 基础平台对应队伍ID */
+    @Excel(name = "基础平台对应队伍ID")
+    private Long platformTeamId;
+
+    /** 企业进场日期 */
+    @Excel(name = "企业进场日期")
+    private Long enterDate;
+
+    /** 企业退场日期 */
+    @Excel(name = "企业退场日期")
+    private Long exitDate;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Long isDel;
+
+    /** 时间戳 */
+    @Excel(name = "时间戳")
+    private Long createTimestamp;
+
+    public static SurProjectAttendanceGroup createHuazhu(JSONObject j) {
+        SurProjectAttendanceGroup g=new SurProjectAttendanceGroup();
+        g.companyId=""+j.getLongValue("unitId",0);
+        g.companyName=j.getString("unitName");
+        g.companyTypeId=j.getString("unitType");
+        g.serverid=j.getString("id");
+        g.enterDate=j.getLong("enterTime");
+        g.exitDate=j.getLong("leaveTime");
+        g.isDel=0l;
+        return  g;
+    }
+
+    public static SurProjectAttendanceGroup createJgw(JSONObject j, boolean isDirectlyUnder) {
+        SurProjectAttendanceGroup g=new SurProjectAttendanceGroup();
+        g.serverid=j.getString("id");
+        if(isDirectlyUnder) {
+            g.companyId = j.getString("leaderTeamId");
+            g.leaderName=j.getString("subcontractorId");
+            g.leaderPhone="directly";
+        }else{
+            g.companyId=j.getString("subcontractorId");
+        }
+        g.companyName=j.getString("corpName");
+        g.teamName=j.getString("teamName");
+
+        g.bizLicense=j.getString("corpCode");
+        g.companyCode=j.getString("teamJobtype");
+
+        g.companyTypeId="0";
+        g.enterDate=0l;
+        g.exitDate=0l;
+        g.isDel=0l;
+        return g;
+    }
+
+    public Long getCreateTimestamp() {
+        return createTimestamp;
+    }
+
+    public void setCreateTimestamp(Long createTimestamp) {
+        this.createTimestamp = createTimestamp;
+    }
+
+    public static SurProjectAttendanceGroup create(JSONObject json) {
+        SurProjectAttendanceGroup g=new SurProjectAttendanceGroup();
+        g.serverid=json.getString("id");
+        g.bizLicense=json.getString("bizLicense");
+        g.companyCode=json.getString("companyCode");
+        g.companyId=""+json.getLongValue("companyId",0);
+        g.companyName=json.getString("companyName");
+        String typeId=json.getString("companyTypeId");
+        if("1".equals(typeId)||"8".equals(typeId)||"9".equals(typeId)){
+            typeId=typeId;
+        }else{
+            typeId="2";
+        }
+        g.companyTypeId=typeId;
+        g.vendorId=json.getLongValue("vendorId",0);
+        g.name=json.getString("name");
+        g.leaderName=json.getString("leaderName");
+        g.leaderPhone=json.getString("leaderPhone");
+        g.teamId=json.getLongValue("teamId",0);
+        g.teamName=json.getString("teamName");
+        g.type=json.getLongValue("type",0);
+        g.leaderId=json.getLongValue("leaderId",0);
+        g.deleted=json.get("deleted")==null?0:(json.getBoolean("deleted")?1:0);
+        g.platformGroupId=json.getLongValue("platformGroupId",0);
+        g.platformTeamId=json.getLongValue("platformTeamId",0);
+        g.enterDate=json.getLongValue("enterDate",0);
+        g.exitDate=json.getLongValue("exitDate",0);
+        g.isDel=0l;
+        return g;
+
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setCfgid(Long cfgid)
+    {
+        this.cfgid = cfgid;
+    }
+
+    public Long getCfgid()
+    {
+        return cfgid;
+    }
+    public void setServerid(String serverid)
+    {
+        this.serverid = serverid;
+    }
+
+    public String getServerid()
+    {
+        return serverid;
+    }
+    public void setBizLicense(String bizLicense)
+    {
+        this.bizLicense = bizLicense;
+    }
+
+    public String getBizLicense()
+    {
+        return bizLicense;
+    }
+    public void setCompanyCode(String companyCode)
+    {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyCode()
+    {
+        return companyCode;
+    }
+    public void setCompanyId(String companyId)
+    {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyId()
+    {
+        return companyId;
+    }
+    public void setCompanyName(String companyName)
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName()
+    {
+        return companyName;
+    }
+    public void setCompanyTypeId(String companyTypeId)
+    {
+        this.companyTypeId = companyTypeId;
+    }
+
+    public String getCompanyTypeId()
+    {
+        return companyTypeId;
+    }
+    public void setVendorId(Long vendorId)
+    {
+        this.vendorId = vendorId;
+    }
+
+    public Long getVendorId()
+    {
+        return vendorId;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setLeaderName(String leaderName)
+    {
+        this.leaderName = leaderName;
+    }
+
+    public String getLeaderName()
+    {
+        return leaderName;
+    }
+    public void setLeaderPhone(String leaderPhone)
+    {
+        this.leaderPhone = leaderPhone;
+    }
+
+    public String getLeaderPhone()
+    {
+        return leaderPhone;
+    }
+    public void setTeamId(Long teamId)
+    {
+        this.teamId = teamId;
+    }
+
+    public Long getTeamId()
+    {
+        return teamId;
+    }
+    public void setTeamName(String teamName)
+    {
+        this.teamName = teamName;
+    }
+
+    public String getTeamName()
+    {
+        return teamName;
+    }
+    public void setType(Long type)
+    {
+        this.type = type;
+    }
+
+    public Long getType()
+    {
+        return type;
+    }
+    public void setLeaderId(Long leaderId)
+    {
+        this.leaderId = leaderId;
+    }
+
+    public Long getLeaderId()
+    {
+        return leaderId;
+    }
+    public void setDeleted(Integer deleted)
+    {
+        this.deleted = deleted;
+    }
+
+    public Integer getDeleted()
+    {
+        return deleted;
+    }
+    public void setPlatformGroupId(Long platformGroupId)
+    {
+        this.platformGroupId = platformGroupId;
+    }
+
+    public Long getPlatformGroupId()
+    {
+        return platformGroupId;
+    }
+    public void setPlatformTeamId(Long platformTeamId)
+    {
+        this.platformTeamId = platformTeamId;
+    }
+
+    public Long getPlatformTeamId()
+    {
+        return platformTeamId;
+    }
+    public void setEnterDate(Long enterDate)
+    {
+        this.enterDate = enterDate;
+    }
+
+    public Long getEnterDate()
+    {
+        return enterDate;
+    }
+    public void setExitDate(Long exitDate)
+    {
+        this.exitDate = exitDate;
+    }
+
+    public Long getExitDate()
+    {
+        return exitDate;
+    }
+    public void setIsDel(Long isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel()
+    {
+        return isDel;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("cfgid", getCfgid())
+                .append("serverid", getServerid())
+                .append("bizLicense", getBizLicense())
+                .append("companyCode", getCompanyCode())
+                .append("companyId", getCompanyId())
+                .append("companyName", getCompanyName())
+                .append("companyTypeId", getCompanyTypeId())
+                .append("vendorId", getVendorId())
+                .append("name", getName())
+                .append("leaderName", getLeaderName())
+                .append("leaderPhone", getLeaderPhone())
+                .append("teamId", getTeamId())
+                .append("teamName", getTeamName())
+                .append("type", getType())
+                .append("leaderId", getLeaderId())
+                .append("deleted", getDeleted())
+                .append("createTimestamp", getCreateTimestamp())
+                .append("platformGroupId", getPlatformGroupId())
+                .append("platformTeamId", getPlatformTeamId())
+                .append("enterDate", getEnterDate())
+                .append("exitDate", getExitDate())
+                .append("remark", getRemark())
+                .append("isDel", getIsDel())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}
+

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/domain/SurProjectAttendanceUser.java

@@ -0,0 +1,733 @@
+package com.yanzhu.xd.system.domain;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 实名制人员对象 sur_project_attendance_user
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public class SurProjectAttendanceUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /**  */
+    private Long id;
+
+    /** 配置项ID,可以获取项目ID和总包ID */
+
+    private Long cfgid;
+
+    /** 注册应用ID */
+
+    private String appId;
+
+    /** 厂商编号参考字典attendance_vendors */
+
+    private String vendorsCode;
+
+    /** 工人id */
+    @Excel(name = "工人id")
+    private String workerId;
+
+    /** 项目工人履历id对于旧劳务，这个字段相当于工人的projectWorkerId，管理人员的registerManagerId */
+
+    private Long laborWorkerId;
+
+    /** 人员类别0：工人，1：管理人员 */
+    @Excel(name = "人员类别0：工人，1：管理人员")
+    private Long workerCategory;
+
+    /** 工号 */
+
+    private Long qrCode;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 民族 */
+    @Excel(name = "民族")
+    private String ethnic;
+
+    /** 籍贯 */
+    @Excel(name = "籍贯")
+    private String nativePlace;
+
+    /** 性别0:男 1:女 */
+    @Excel(name = "性别0:男 1:女")
+    private Long gender;
+
+    /** 出生日期时间戳 */
+    @Excel(name = "出生日期时间戳")
+    private Long birthDate;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** 学历 */
+    @Excel(name = "学历")
+    private String degreeName;
+
+    /** 身份证照 */
+    @Excel(name = "身份证照")
+    private String photo;
+
+    /** 近照 */
+
+    private String recentPhoto;
+
+    /** 所属班组ID */
+
+    private String groupId;
+
+    /** 所属班组 */
+    @Excel(name = "所属班组")
+    private String groupName;
+
+    /** 是否班组长 */
+    @Excel(name = "是否班组长")
+    private Integer leader;
+
+    /** 工种编码 */
+    @Excel(name = "工种编码")
+    private String workTypeCode;
+
+    /** 工种 */
+    @Excel(name = "工种")
+    private String workTypeName;
+
+    /** 是否特殊工种 */
+    @Excel(name = "是否特殊工种")
+    private Integer specWorkType;
+
+    /** 安全帽编号 */
+    @Excel(name = "安全帽编号")
+    private String hatCode;
+
+    /** 进退场状态0:进场，1:退场 */
+    @Excel(name = "进退场状态0:进场，1:退场")
+    private Long state;
+
+    /** 进场日期 */
+    @Excel(name = "进场日期")
+    private String enterDate;
+
+    /** 退场日期 */
+    @Excel(name = "退场日期")
+    private String exitDate;
+
+    /** 分包商id */
+    @Excel(name = "分包商id")
+    private String companyId;
+
+    /** 分包商名称 */
+    @Excel(name = "分包商名称")
+    private String companyName;
+
+    /** 平台对应分包商ID */
+    @Excel(name = "平台对应分包商ID")
+    private Long vendorId;
+
+    /** 队伍id */
+    @Excel(name = "队伍id")
+    private Integer teamId;
+
+    /** 队伍名称 */
+    @Excel(name = "队伍名称")
+    private String teamName;
+
+    /** 进场方式0:自动,1:手动2:拍照 */
+    @Excel(name = "进场方式0:自动,1:手动2:拍照")
+    private String enterType;
+
+    /** 服务返回的JSON */
+    @Excel(name = "服务返回的JSON")
+    private String other;
+
+    /** 是否有效 */
+    @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;
+    }
+
+    @Excel(name = "进场时间")
+    private Date inTime;
+    @Excel(name = "离场时间")
+    private Date outTime;
+
+    public static SurProjectAttendanceUser createFromHuazhu(JSONObject j) {
+        SurProjectAttendanceUser u=new SurProjectAttendanceUser();
+        u.workerId=j.getString("id");
+        u.name=j.getString("name");
+        u.ethnic=j.getString("nationalName");
+        u.nativePlace=j.getString("provinceName")+j.getString("cityName");
+        u.gender=j.getLongValue("sex",0)==0l?1l:0l;
+        u.birthDate=j.getLongValue("birthday",0);
+        u.phone=j.getString("phone");
+        u.degreeName=j.getString("levelOfEducation");
+        u.recentPhoto=j.getString("profile");
+        u.groupId=j.getString("teamId");
+        u.groupName=j.getString("teamName");
+        u.workTypeCode=j.getString("workerTypeId");
+        u.workTypeName=j.getString("workerTypeName");
+        u.state=j.getLongValue("status",1)==2l?0l:1l;
+        long enterTime=j.getLong("enterTime");
+        if(enterTime>0){
+            u.enterDate= DateUtil.format(DateUtil.date(enterTime),"yyyy-MM-dd HH:mm:ss");
+        }
+        long leaveTime=j.getLong("leaveTime");
+        if(leaveTime>0) {
+            u.exitDate = DateUtil.format(DateUtil.date(leaveTime), "yyyy-MM-dd HH:mm:ss");
+        }
+        u.vendorId=j.getLongValue("unitProjectId",0);
+        u.companyId=""+j.getLongValue("unitId",0);
+        u.companyName=j.getString("unitName");
+        u.teamName=j.getString("teamName");
+        return u;
+    }
+
+    public static SurProjectAttendanceUser createFromJgw(JSONObject j) {
+        SurProjectAttendanceUser u=new SurProjectAttendanceUser();
+        u.workerId=j.getString("workerId");
+        u.name=j.getString("name");
+        u.ethnic=j.getString("minor");
+        u.phone=j.getString("workPhone");
+        u.nativePlace=j.getString("address");
+        u.gender=j.getLongValue("sex",0)==0l?1l:0l;
+        String tmp=j.getString("birthday");
+        if(StrUtil.isNotEmpty(tmp)) {
+            try {
+                u.birthDate = DateUtil.parse(tmp).getTime();
+            }catch (Exception ex){
+
+            }
+        }
+        u.photo=j.getString("headImage");
+        u.degreeName=j.getString("education");
+        u.recentPhoto=j.getString("vaildPhoto");
+        u.groupId="";
+        u.groupName="";
+        u.workTypeCode="";
+        u.workTypeName=j.getString("jobtype");
+        u.state="01".equals( j.getString("workerStatus"))?0l:1l;
+        String workDate=j.getString("workDate");
+        if(!StrUtil.isEmpty(workDate)){
+            u.enterDate=workDate;
+        }
+        u.vendorId=0l;
+        u.companyId=j.getString("subcontractorId");
+        u.companyName="";
+        u.teamName="";
+        u.isDel=0l;
+        JSONArray ja=j.getJSONArray("corpName");
+        if(ja!=null && ja.size()>0){
+            Object obj=ja.get(0);
+            if(obj!=null){
+                u.companyName=obj.toString();
+            }
+        }
+
+        u.leader=j.getInteger("isAdmin")==1?1:0;
+        return  u;
+    }
+
+    public Date getInTime() {
+        return inTime;
+    }
+
+    public void setInTime(Date inTime) {
+        this.inTime = inTime;
+    }
+
+    public Date getOutTime() {
+        return outTime;
+    }
+
+    public void setOutTime(Date outTime) {
+        this.outTime = outTime;
+    }
+
+    private Long projectId;
+    private Long subDeptId;
+    private Long deptId;
+
+    private List<String> workerIds;
+
+    public List<String> getWorkerIds() {
+        return workerIds;
+    }
+
+    public void setWorkerIds(List<String> workerIds) {
+        this.workerIds = workerIds;
+    }
+
+    private int size;
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    private int index;
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    public Long getSubDeptId() {
+        return subDeptId;
+    }
+
+    public void setSubDeptId(Long subDeptId) {
+        this.subDeptId = subDeptId;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public static SurProjectAttendanceUser create(JSONObject json) {
+        SurProjectAttendanceUser u=new SurProjectAttendanceUser();
+        u.workerId=json.getString("workerId");
+        u.laborWorkerId=json.getLongValue("laborWorkerId",0);
+        u.workerCategory=json.getLongValue("workerCategory",0);
+        u.qrCode=json.getLongValue("qrCode",0);
+        u.name=json.getString("name");
+        u.ethnic=json.getString("ethnic");
+        u.nativePlace=json.getString("nativePlace");
+        u.gender=json.getLongValue("gender",0);
+        u.birthDate=json.getLongValue("birthDate",0);
+        u.phone=json.getString("phone");
+        u.recentPhoto=json.getString("recentPhoto");
+        u.groupId=json.getString("groupId");
+        u.groupName=json.getString("groupName");
+        u.leader=json.getBooleanValue("leader",false)?1:0;
+        u.workTypeCode=json.getString("workTypeCode");
+        u.workTypeName=json.getString("workTypeName");
+        u.specWorkType=json.getBooleanValue("specWorkType",false)?1:0;
+        u.hatCode=json.getString("hatCode");
+        u.state=json.getLongValue("status",0);
+        u.enterDate=json.getString("enterDate");
+        u.exitDate=json.getString("exitDate");
+        u.companyId=""+json.getLongValue("companyId",0);
+        u.companyName=json.getString("companyName");
+        u.vendorId=json.getLongValue("vendorId",0);
+        u.teamId=json.getInteger("teamId");
+        u.teamName=json.getString("teamName");
+        u.enterType=json.getString("enterType");
+        u.isDel=0l;
+        return u;
+    }
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setCfgid(Long cfgid)
+    {
+        this.cfgid = cfgid;
+    }
+
+    public Long getCfgid()
+    {
+        return cfgid;
+    }
+    public void setVendorsCode(String vendorsCode)
+    {
+        this.vendorsCode = vendorsCode;
+    }
+
+    public String getVendorsCode()
+    {
+        return vendorsCode;
+    }
+    public void setWorkerId(String workerId)
+    {
+        this.workerId = workerId;
+    }
+
+    public String getWorkerId()
+    {
+        return workerId;
+    }
+    public void setLaborWorkerId(Long laborWorkerId)
+    {
+        this.laborWorkerId = laborWorkerId;
+    }
+
+    public Long getLaborWorkerId()
+    {
+        return laborWorkerId;
+    }
+    public void setWorkerCategory(Long workerCategory)
+    {
+        this.workerCategory = workerCategory;
+    }
+
+    public Long getWorkerCategory()
+    {
+        return workerCategory;
+    }
+    public void setQrCode(Long qrCode)
+    {
+        this.qrCode = qrCode;
+    }
+
+    public Long getQrCode()
+    {
+        return qrCode;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setEthnic(String ethnic)
+    {
+        this.ethnic = ethnic;
+    }
+
+    public String getEthnic()
+    {
+        return ethnic;
+    }
+    public void setNativePlace(String nativePlace)
+    {
+        this.nativePlace = nativePlace;
+    }
+
+    public String getNativePlace()
+    {
+        return nativePlace;
+    }
+    public void setGender(Long gender)
+    {
+        this.gender = gender;
+    }
+
+    public Long getGender()
+    {
+        return gender;
+    }
+    public void setBirthDate(Long birthDate)
+    {
+        this.birthDate = birthDate;
+    }
+
+    public Long getBirthDate()
+    {
+        return birthDate;
+    }
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone()
+    {
+        return phone;
+    }
+    public void setDegreeName(String degreeName)
+    {
+        this.degreeName = degreeName;
+    }
+
+    public String getDegreeName()
+    {
+        return degreeName;
+    }
+    public void setPhoto(String photo)
+    {
+        this.photo = photo;
+    }
+
+    public String getPhoto()
+    {
+        return photo;
+    }
+    public void setRecentPhoto(String recentPhoto)
+    {
+        this.recentPhoto = recentPhoto;
+    }
+
+    public String getRecentPhoto()
+    {
+        return recentPhoto;
+    }
+    public void setGroupId(String groupId)
+    {
+        this.groupId = groupId;
+    }
+
+    public String getGroupId()
+    {
+        return groupId;
+    }
+    public void setGroupName(String groupName)
+    {
+        this.groupName = groupName;
+    }
+
+    public String getGroupName()
+    {
+        return groupName;
+    }
+    public void setLeader(Integer leader)
+    {
+        this.leader = leader;
+    }
+
+    public Integer getLeader()
+    {
+        return leader;
+    }
+    public void setWorkTypeCode(String workTypeCode)
+    {
+        this.workTypeCode = workTypeCode;
+    }
+
+    public String getWorkTypeCode()
+    {
+        return workTypeCode;
+    }
+    public void setWorkTypeName(String workTypeName)
+    {
+        this.workTypeName = workTypeName;
+    }
+
+    public String getWorkTypeName()
+    {
+        return workTypeName;
+    }
+    public void setSpecWorkType(Integer specWorkType)
+    {
+        this.specWorkType = specWorkType;
+    }
+
+    public Integer getSpecWorkType()
+    {
+        return specWorkType;
+    }
+    public void setHatCode(String hatCode)
+    {
+        this.hatCode = hatCode;
+    }
+
+    public String getHatCode()
+    {
+        return hatCode;
+    }
+    public void setState(Long state)
+    {
+        this.state = state;
+    }
+
+    public Long getState()
+    {
+        return state;
+    }
+    public void setEnterDate(String enterDate)
+    {
+        this.enterDate = enterDate;
+    }
+
+    public String getEnterDate()
+    {
+        return enterDate;
+    }
+    public void setExitDate(String exitDate)
+    {
+        this.exitDate = exitDate;
+    }
+
+    public String getExitDate()
+    {
+        return exitDate;
+    }
+    public void setCompanyId(String companyId)
+    {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyId()
+    {
+        return companyId;
+    }
+    public void setCompanyName(String companyName)
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName()
+    {
+        return companyName;
+    }
+    public void setVendorId(Long vendorId)
+    {
+        this.vendorId = vendorId;
+    }
+
+    public Long getVendorId()
+    {
+        return vendorId;
+    }
+    public void setTeamId(Integer teamId)
+    {
+        this.teamId = teamId;
+    }
+
+    public Integer getTeamId()
+    {
+        return teamId;
+    }
+    public void setTeamName(String teamName)
+    {
+        this.teamName = teamName;
+    }
+
+    public String getTeamName()
+    {
+        return teamName;
+    }
+    public void setEnterType(String enterType)
+    {
+        this.enterType = enterType;
+    }
+
+    public String getEnterType()
+    {
+        return enterType;
+    }
+    public void setOther(String other)
+    {
+        this.other = other;
+    }
+
+    public String getOther()
+    {
+        return other;
+    }
+    public void setIsDel(Long isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel()
+    {
+        return isDel;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getCompanyTypeId() {
+        return companyTypeId;
+    }
+
+    public void setCompanyTypeId(String companyTypeId) {
+        this.companyTypeId = companyTypeId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("cfgid", getCfgid())
+                .append("vendorsCode", getVendorsCode())
+                .append("workerId", getWorkerId())
+                .append("laborWorkerId", getLaborWorkerId())
+                .append("workerCategory", getWorkerCategory())
+                .append("qrCode", getQrCode())
+                .append("name", getName())
+                .append("ethnic", getEthnic())
+                .append("nativePlace", getNativePlace())
+                .append("gender", getGender())
+                .append("birthDate", getBirthDate())
+                .append("phone", getPhone())
+                .append("degreeName", getDegreeName())
+                .append("photo", getPhoto())
+                .append("recentPhoto", getRecentPhoto())
+                .append("groupId", getGroupId())
+                .append("groupName", getGroupName())
+                .append("leader", getLeader())
+                .append("workTypeCode", getWorkTypeCode())
+                .append("workTypeName", getWorkTypeName())
+                .append("specWorkType", getSpecWorkType())
+                .append("hatCode", getHatCode())
+                .append("state", getState())
+                .append("enterDate", getEnterDate())
+                .append("exitDate", getExitDate())
+                .append("companyId", getCompanyId())
+                .append("companyName", getCompanyName())
+                .append("vendorId", getVendorId())
+                .append("teamId", getTeamId())
+                .append("teamName", getTeamName())
+                .append("enterType", getEnterType())
+                .append("other", getOther())
+                .append("remark", getRemark())
+                .append("isDel", getIsDel())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/domain/SysNative.java

@@ -0,0 +1,93 @@
+package com.yanzhu.xd.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 省市县对象 sys_native
+ * 
+ * @author ruoyi
+ * @date 2024-10-26
+ */
+public class SysNative extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /**  */
+    @Excel(name = "")
+    private String address;
+
+    /**  */
+    @Excel(name = "")
+    private String provinces;
+
+    /**  */
+    @Excel(name = "")
+    private String citiy;
+
+    /**  */
+    @Excel(name = "")
+    private String areas;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setProvinces(String provinces) 
+    {
+        this.provinces = provinces;
+    }
+
+    public String getProvinces() 
+    {
+        return provinces;
+    }
+    public void setCitiy(String citiy) 
+    {
+        this.citiy = citiy;
+    }
+
+    public String getCitiy() 
+    {
+        return citiy;
+    }
+    public void setAreas(String areas) 
+    {
+        this.areas = areas;
+    }
+
+    public String getAreas() 
+    {
+        return areas;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("address", getAddress())
+            .append("provinces", getProvinces())
+            .append("citiy", getCitiy())
+            .append("areas", getAreas())
+            .toString();
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/domain/TowerContentReqVo.java

@@ -0,0 +1,91 @@
+package com.yanzhu.xd.system.domain;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔吊检测推送信息 请求内容
+ *
+ * @author: JiangYuQi
+ * @date: 2024/01/13 12:21
+ */
+public class TowerContentReqVo {
+
+    /**
+     * 数据产生的时间戳
+     */
+    private Long time;
+
+    /**
+     * 数据类型
+     */
+    private String dataType;
+
+    /**
+     * 设备序列号，唯一标识 84E0*****
+     */
+    private String deviceKey;
+
+    /**
+     * 上报内容
+     */
+    private Map<String, Object> dataContent;
+
+    /**
+     * 碰撞信息
+     */
+    private Map<String, Object> localDeviceInfo;
+
+    /**
+     * 碰撞塔吊设备信息
+     */
+    private List<Map<String, Object>> collideTowers;
+
+    public Long getTime() {
+        return time;
+    }
+
+    public void setTime(Long time) {
+        this.time = time;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
+    public String getDeviceKey() {
+        return deviceKey;
+    }
+
+    public void setDeviceKey(String deviceKey) {
+        this.deviceKey = deviceKey;
+    }
+
+    public Map<String, Object> getDataContent() {
+        return dataContent;
+    }
+
+    public void setDataContent(Map<String, Object> dataContent) {
+        this.dataContent = dataContent;
+    }
+
+    public Map<String, Object> getLocalDeviceInfo() {
+        return localDeviceInfo;
+    }
+
+    public void setLocalDeviceInfo(Map<String, Object> localDeviceInfo) {
+        this.localDeviceInfo = localDeviceInfo;
+    }
+
+    public List<Map<String, Object>> getCollideTowers() {
+        return collideTowers;
+    }
+
+    public void setCollideTowers(List<Map<String, Object>> collideTowers) {
+        this.collideTowers = collideTowers;
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/domain/TowerReqVo.java

@@ -0,0 +1,40 @@
+package com.yanzhu.xd.system.domain;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 塔吊检测推送信息 请求参数
+ *
+ * @author: JiangYuQi
+ * @date: 2024/01/13 12:21
+ */
+public class TowerReqVo {
+
+    /**
+     * 上报类型
+     */
+    @NotNull(message = "上报类型不能为空")
+    private int type;
+
+    /**
+     * 上报内容
+     */
+    @NotNull(message = "上报内容不能为空")
+    private TowerContentReqVo content;
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public TowerContentReqVo getContent() {
+        return content;
+    }
+
+    public void setContent(TowerContentReqVo content) {
+        this.content = content;
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/emuns/CacheConstants.java

@@ -0,0 +1,15 @@
+package com.yanzhu.xd.system.emuns;
+
+/**
+ * 缓存的key 常量
+ *
+ * @author JiangYuQi
+ */
+public class CacheConstants {
+
+    /**
+     * yanzhu设备塔吊检测 redis key
+     */
+    public static final String YANZHU_DEVICE_TOWER = "device.tower_cfg:";
+
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/emuns/TowerTypeEnums.java

@@ -0,0 +1,34 @@
+package com.yanzhu.xd.system.emuns;
+
+/**
+ * 塔吊数据类型
+ */
+public enum TowerTypeEnums {
+
+    BASE(118,"塔机上报基本信息"),
+    RUN(111,"塔机上报实时数据"),
+    ROUND(119,"塔机上报工作循环数据"),
+    COLLIDE(116,"塔机上报碰撞信息"),
+    LIMIT(120,"塔机上报限位信息"),
+    LOCAL(121,"塔机上报标定位信息");
+
+    private final int code;
+    private final String info;
+
+    TowerTypeEnums(int code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public int getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/mapper/DevTowerProjectConfigMapper.java

@@ -0,0 +1,78 @@
+package com.yanzhu.xd.system.mapper;
+
+import com.yanzhu.xd.system.domain.DevTowerProjectConfig;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔基检测配置Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface DevTowerProjectConfigMapper 
+{
+    /**
+     * 查询塔基检测配置
+     * 
+     * @param id 塔基检测配置主键
+     * @return 塔基检测配置
+     */
+    public DevTowerProjectConfig selectDevTowerProjectConfigById(Long id);
+
+    /**
+     * 查询塔基检测配置
+     *
+     * @param sn 塔基序列号
+     * @return 塔基检测配置
+     */
+    public DevTowerProjectConfig selectDevTowerProjectConfigBySn(String sn);
+
+    /**
+     * 查询塔基检测配置列表
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 塔基检测配置集合
+     */
+    public List<DevTowerProjectConfig> selectDevTowerProjectConfigList(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 新增塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    public int insertDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 修改塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    public int updateDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 删除塔基检测配置
+     * 
+     * @param id 塔基检测配置主键
+     * @return 结果
+     */
+    public int deleteDevTowerProjectConfigById(Long id);
+
+    /**
+     * 批量删除塔基检测配置
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerProjectConfigByIds(Long[] ids);
+
+    /**
+     * 根据设备状态统计设备
+     * @param devTowerProjectConfig
+     * @return
+     */
+    public List<Map<String, Object>> findtowerConfigGroupOnline(DevTowerProjectConfig devTowerProjectConfig);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/mapper/SurProjectAttendanceCfgMapper.java

@@ -0,0 +1,63 @@
+package com.yanzhu.xd.system.mapper;
+
+import java.util.List;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceCfg;
+
+/**
+ * 考勤配置Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public interface SurProjectAttendanceCfgMapper 
+{
+    /**
+     * 查询项目考勤配置
+     *
+     * @param id 项目考勤配置主键
+     * @return 项目考勤配置
+     */
+    public SurProjectAttendanceCfg selectSurProjectAttendanceCfgById(Long id);
+
+    /**
+     * 查询项目考勤配置列表
+     *
+     * @param quartzProjectAttendanceCfg 项目考勤配置
+     * @return 项目考勤配置集合
+     */
+    public List<SurProjectAttendanceCfg> selectSurProjectAttendanceCfgList(SurProjectAttendanceCfg quartzProjectAttendanceCfg);
+
+    /**
+     * 新增项目考勤配置
+     *
+     * @param quartzProjectAttendanceCfg 项目考勤配置
+     * @return 结果
+     */
+    public int insertSurProjectAttendanceCfg(SurProjectAttendanceCfg quartzProjectAttendanceCfg);
+
+    /**
+     * 修改项目考勤配置
+     *
+     * @param quartzProjectAttendanceCfg 项目考勤配置
+     * @return 结果
+     */
+    public int updateSurProjectAttendanceCfg(SurProjectAttendanceCfg quartzProjectAttendanceCfg);
+
+    /**
+     * 删除项目考勤配置
+     *
+     * @param id 项目考勤配置主键
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceCfgById(Long id);
+
+    /**
+     * 批量删除项目考勤配置
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceCfgByIds(Long[] ids);
+
+    public List<SurProjectAttendanceCfg> selectSurProjectAttendanceCfgListForAllInfo(SurProjectAttendanceCfg where);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/mapper/SurProjectAttendanceDataMapper.java

@@ -0,0 +1,135 @@
+package com.yanzhu.xd.system.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.yanzhu.xd.system.domain.SurProjectAttendanceData;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 考勤数据Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public interface SurProjectAttendanceDataMapper 
+{
+    /**
+     * 查询劳务实名制管理
+     *
+     * @param id 劳务实名制管理主键
+     * @return 劳务实名制管理
+     */
+    public SurProjectAttendanceData selectSurProjectAttendanceDataById(Long id);
+
+    /**
+     * 查询劳务实名制管理列表
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 劳务实名制管理集合
+     */
+    public List<SurProjectAttendanceData> selectSurProjectAttendanceDataList(SurProjectAttendanceData quartzProjectAttendanceData);
+
+    /**
+     * 查询考勤信息
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 劳务实名制管理集合
+     */
+    public SurProjectAttendanceData findCurrentAttendanceData(SurProjectAttendanceData quartzProjectAttendanceData);
+
+    public List<SurProjectAttendanceData> selectSurProjectAttendanceDataListEx(SurProjectAttendanceData quartzProjectAttendanceData);
+    /**
+     * 新增劳务实名制管理
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 结果
+     */
+    public int insertSurProjectAttendanceData(SurProjectAttendanceData quartzProjectAttendanceData);
+
+    /**
+     * 修改劳务实名制管理
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 结果
+     */
+    public int updateSurProjectAttendanceData(SurProjectAttendanceData quartzProjectAttendanceData);
+
+    /**
+     * 删除劳务实名制管理
+     *
+     * @param id 劳务实名制管理主键
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceDataById(Long id);
+
+    /**
+     * 批量删除劳务实名制管理
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceDataByIds(Long[] ids);
+
+    /**
+     * 批量删除劳务实名制管理
+     *
+     * @param list 需要删除的数据参数集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceDataByParams(List<String> list);
+
+    /**
+     * 批量新增劳务实名制考勤管理
+     *
+     * @param quartzProjectAttendanceDataList 劳务实名制考勤管理列表
+     * @return 结果
+     */
+    public int batchSurProjectAttendanceData(@Param("list") List<SurProjectAttendanceData> quartzProjectAttendanceDataList, @Param("year") String year);
+
+    public Long getLastServerId(SurProjectAttendanceData where);
+
+    List<SurProjectAttendanceData> groupAllByComany(SurProjectAttendanceData where);
+    List<SurProjectAttendanceData> groupByComany(SurProjectAttendanceData where);
+
+    public Long getHuazhuPage(SurProjectAttendanceData where);
+
+
+    public List<Map<String,Object>> initOtherData(Map<String,Object> data);
+
+    public List<Map<String,Object>> initHuaZhuData(Map<String,Object> data);
+
+    public String findHuaZhuCompanyType(String deptName);
+
+    public List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where);
+
+    /**
+     * 统计人员数据
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> findGroupAllByDays(SurProjectAttendanceData where);
+
+    /**
+     * 统计所有数据
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> findGroupAllByParams(SurProjectAttendanceData where);
+
+    /**
+     * 统计考勤数据
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> groupDataByParams(SurProjectAttendanceData where);
+
+    /**
+     * 考勤数据列表
+     * @param where
+     * @return
+     */
+    public List<SurProjectAttendanceData> attendanceDataList(SurProjectAttendanceData where);
+
+    public List<SurProjectAttendanceData> groupTodayCompanyTypeId(SurProjectAttendanceData where);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/mapper/SurProjectAttendanceGroupMapper.java

@@ -0,0 +1,85 @@
+package com.yanzhu.xd.system.mapper;
+
+import java.util.List;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceGroup;
+
+/**
+ * 班组信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public interface SurProjectAttendanceGroupMapper 
+{
+    /**
+     * 查询广联达班组信息
+     *
+     * @param id 广联达班组信息主键
+     * @return 广联达班组信息
+     */
+    public SurProjectAttendanceGroup selectSurProjectAttendanceGroupById(Long id);
+
+    /**
+     * 查询广联达班组信息列表
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 广联达班组信息集合
+     */
+    public List<SurProjectAttendanceGroup> selectSurProjectAttendanceGroupViewList(SurProjectAttendanceGroup quartzProjectAttendanceGroup);
+
+    /**
+     * 查询广联达班组信息列表
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 广联达班组信息集合
+     */
+    public List<SurProjectAttendanceGroup> selectSurProjectAttendanceGroupList(SurProjectAttendanceGroup quartzProjectAttendanceGroup);
+
+    /**
+     * 新增广联达班组信息
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    public int insertSurProjectAttendanceGroup(SurProjectAttendanceGroup quartzProjectAttendanceGroup);
+
+    /**
+     * 修改广联达班组信息
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    public int updateSurProjectAttendanceGroup(SurProjectAttendanceGroup quartzProjectAttendanceGroup);
+
+    /**
+     * 删除广联达班组信息
+     *
+     * @param id 广联达班组信息主键
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceGroupById(Long id);
+
+    /**
+     * 批量删除广联达班组信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceGroupByIds(Long[] ids);
+
+    /**
+     * 批量删除广联达班组信息
+     *
+     * @param list 需要删除的数据参数集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceGroupByParams(List<String> list);
+
+    /**
+     * 批量新增广联达班组信息
+     *
+     * @param quartzProjectAttendanceGroupList 广联达班组信息列表
+     * @return 结果
+     */
+    public int batchSurProjectAttendanceGroup(List<SurProjectAttendanceGroup> quartzProjectAttendanceGroupList);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/mapper/SurProjectAttendanceUserMapper.java

@@ -0,0 +1,167 @@
+package com.yanzhu.xd.system.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.yanzhu.xd.system.domain.SurProjectAttendanceUser;
+
+/**
+ * 实名制人员Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public interface SurProjectAttendanceUserMapper 
+{
+    /**
+     * 查询考勤人员基本属性
+     *
+     * @param id 考勤人员基本属性主键
+     * @return 考勤人员基本属性
+     */
+    public SurProjectAttendanceUser selectSurProjectAttendanceUserById(Long id);
+
+    /**
+     * 查询考勤人员信息
+     *
+     * @param quartzProjectAttendanceUser
+     * @return 考勤人员基本属性
+     */
+    public SurProjectAttendanceUser findCurrentAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    /**
+     * 查询[研筑]考勤人员信息
+     *
+     * @param quartzProjectAttendanceUser
+     * @return 考勤人员基本属性
+     */
+    public SurProjectAttendanceUser findYzCurrentAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    /**
+     * 查询考勤人员基本属性列表
+     *
+     * @param quartzProjectAttendanceUser 考勤人员基本属性
+     * @return 考勤人员基本属性集合
+     */
+    public List<SurProjectAttendanceUser> selectSurProjectAttendanceUserList(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+
+    public List<SurProjectAttendanceUser> querySurProjectAttendanceUserList(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    public List<SurProjectAttendanceUser> selectSurProjectAttendanceUserListJgw(SurProjectAttendanceUser quartzProjectAttendanceUser);
+    /**
+     * 新增考勤人员基本属性
+     *
+     * @param quartzProjectAttendanceUser 考勤人员基本属性
+     * @return 结果
+     */
+    public int insertSurProjectAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    /**
+     * 修改考勤人员基本属性
+     *
+     * @param quartzProjectAttendanceUser 考勤人员基本属性
+     * @return 结果
+     */
+    public int updateSurProjectAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    /**
+     * 删除考勤人员基本属性
+     *
+     * @param id 考勤人员基本属性主键
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceUserById(Long id);
+
+    /**
+     * 批量删除考勤人员基本属性
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceUserByIds(Long[] ids);
+
+    /**
+     * 批量删除考勤人员基本属性
+     *
+     * @param list 需要删除的数据参数集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceUserByParams(List<String> list);
+
+    /**
+     * 批量新增考勤人员基本属性
+     *
+     * @param quartzProjectAttendanceUserList 考勤人员基本属性列表
+     * @return 结果
+     */
+    public int batchSurProjectAttendanceUser(List<SurProjectAttendanceUser> quartzProjectAttendanceUserList);
+
+    /**
+     * 下面三个方法完成考勤记录分页查询
+     * countAttendance 获取总记录条数
+     * queryAttendanceUsers 获取当前页workerIds
+     * queryAttendanceByUserIds 根据workerIds查询一页数据然后组装
+     * @param where
+     * @return
+     */
+    public List<SurProjectAttendanceUser> queryAttendanceByUserIds(SurProjectAttendanceUser where);
+    public long countAttendance(SurProjectAttendanceUser where);
+    public List<SurProjectAttendanceUser> queryAttendanceUsers(SurProjectAttendanceUser where);
+
+    public long countTodayAttendance(SurProjectAttendanceUser where);
+
+
+    public List<SurProjectAttendanceUser> todayAttendance(SurProjectAttendanceUser where);
+    public List<SurProjectAttendanceUser> todayAttendanceData(List<String> list);
+
+    public List<SurProjectAttendanceUser> todayAttendanceOtherData(Map<String,Object> data);
+
+    /**
+     * 在岗工人查询
+     * @param where
+     * @return
+     */
+    List<SurProjectAttendanceUser> queryWorkerOnDuty(SurProjectAttendanceUser where);
+
+    /**
+     * 统计人员数据
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> groupUserByParams(SurProjectAttendanceUser where);
+
+    /**
+     * 在岗工人查询
+     * @param where
+     * @return
+     */
+    public List<SurProjectAttendanceUser> attendanceUserList(SurProjectAttendanceUser where);
+
+    /**
+     * 统计人员数据
+     * @param projectId
+     * @return
+     */
+    public List<Map<String, Object>> findUserAllByDays(Long projectId);
+
+    /**
+     * 按部门汇总在岗人数
+     * @param where
+     * @return
+     */
+    List<SurProjectAttendanceUser> groupByWorkerOnDutyByDept(SurProjectAttendanceUser where);
+    /**
+     * 按部门汇总在岗|离岗人数
+     * @param where
+     * @return
+     */
+    List<SurProjectAttendanceUser> groupByWorkerByDept(SurProjectAttendanceUser where);
+    /**
+     * 在岗|离岗工人查询
+     * @param where
+     * @return
+     */
+    List<SurProjectAttendanceUser> queryWorkerByState(SurProjectAttendanceUser where);
+
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/mapper/SurProjectMapper.java

@@ -0,0 +1,61 @@
+package com.yanzhu.xd.system.mapper;
+
+import java.util.List;
+import com.yanzhu.xd.system.domain.SurProject;
+
+/**
+ * 项目Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public interface SurProjectMapper 
+{
+    /**
+     * 查询项目
+     * 
+     * @param id 项目ID
+     * @return 项目
+     */
+    public SurProject selectSurProjectById(Long id);
+
+    /**
+     * 查询项目列表
+     * 
+     * @param surProject 项目
+     * @return 项目集合
+     */
+    public List<SurProject> selectSurProjectList(SurProject surProject);
+
+    /**
+     * 新增项目
+     * 
+     * @param surProject 项目
+     * @return 结果
+     */
+    public int insertSurProject(SurProject surProject);
+
+    /**
+     * 修改项目
+     * 
+     * @param surProject 项目
+     * @return 结果
+     */
+    public int updateSurProject(SurProject surProject);
+
+    /**
+     * 删除项目
+     * 
+     * @param id 项目ID
+     * @return 结果
+     */
+    public int deleteSurProjectById(Long id);
+
+    /**
+     * 批量删除项目
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSurProjectByIds(String[] ids);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/mapper/SysNativeMapper.java

@@ -0,0 +1,63 @@
+package com.yanzhu.xd.system.mapper;
+
+import java.util.List;
+import com.yanzhu.xd.system.domain.SysNative;
+
+/**
+ * 省市县Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-26
+ */
+public interface SysNativeMapper 
+{
+    /**
+     * 查询省市县
+     * 
+     * @param id 省市县ID
+     * @return 省市县
+     */
+    public SysNative selectSysNativeById(Long id);
+
+    /**
+     * 查询省市县列表
+     * 
+     * @param sysNative 省市县
+     * @return 省市县集合
+     */
+    public List<SysNative> selectSysNativeList(SysNative sysNative);
+
+    /**
+     * 新增省市县
+     * 
+     * @param sysNative 省市县
+     * @return 结果
+     */
+    public int insertSysNative(SysNative sysNative);
+
+    /**
+     * 修改省市县
+     * 
+     * @param sysNative 省市县
+     * @return 结果
+     */
+    public int updateSysNative(SysNative sysNative);
+
+    /**
+     * 删除省市县
+     * 
+     * @param id 省市县ID
+     * @return 结果
+     */
+    public int deleteSysNativeById(Long id);
+
+    /**
+     * 批量删除省市县
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSysNativeByIds(String[] ids);
+
+    List<SysNative> selectSysNativeListById(long id);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/IDevTowerProjectConfigService.java

@@ -0,0 +1,87 @@
+package com.yanzhu.xd.system.service;
+
+import com.yanzhu.xd.system.domain.DevTowerProjectConfig;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔基检测配置Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface IDevTowerProjectConfigService 
+{
+
+    /**
+     * 查询塔基检测配置
+     *
+     * @param id 塔基检测配置主键
+     * @return 塔基检测配置
+     */
+    public DevTowerProjectConfig selectDevTowerProjectConfigById(Long id);
+
+    /**
+     * 查询塔基检测配置
+     *
+     * @param sn 塔基序列号
+     * @return 塔基检测配置
+     */
+    public DevTowerProjectConfig selectDevTowerProjectConfigBySn(String sn);
+
+    /**
+     * 查询塔基检测配置列表
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 塔基检测配置集合
+     */
+    public List<DevTowerProjectConfig> selectDevTowerProjectConfigList(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 新增塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    public int insertDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 修改塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    public int updateDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 修改塔基检测配置
+     *
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    public int updateDevTowerProjectConfigNoCache(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 批量删除塔基检测配置
+     * 
+     * @param ids 需要删除的塔基检测配置主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerProjectConfigByIds(Long[] ids);
+
+    /**
+     * 删除塔基检测配置信息
+     * 
+     * @param id 塔基检测配置主键
+     * @return 结果
+     */
+    public int deleteDevTowerProjectConfigById(Long id);
+
+    /**
+     * 根据设备状态统计设备
+     * @param devTowerProjectConfig
+     * @return
+     */
+    public List<Map<String, Object>> findtowerConfigGroupOnline(DevTowerProjectConfig devTowerProjectConfig);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/ISurProjectAttendanceCfgService.java

@@ -0,0 +1,61 @@
+package com.yanzhu.xd.system.service;
+
+import java.util.List;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceCfg;
+
+/**
+ * 考勤配置Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public interface ISurProjectAttendanceCfgService 
+{
+    /**
+     * 查询项目考勤配置
+     *
+     * @param id 项目考勤配置主键
+     * @return 项目考勤配置
+     */
+    public SurProjectAttendanceCfg selectSurProjectAttendanceCfgById(Long id);
+
+    /**
+     * 查询项目考勤配置列表
+     *
+     * @param quartzProjectAttendanceCfg 项目考勤配置
+     * @return 项目考勤配置集合
+     */
+    public List<SurProjectAttendanceCfg> selectSurProjectAttendanceCfgList(SurProjectAttendanceCfg quartzProjectAttendanceCfg);
+
+    /**
+     * 新增项目考勤配置
+     *
+     * @param quartzProjectAttendanceCfg 项目考勤配置
+     * @return 结果
+     */
+    public int insertSurProjectAttendanceCfg(SurProjectAttendanceCfg quartzProjectAttendanceCfg);
+
+    /**
+     * 修改项目考勤配置
+     *
+     * @param quartzProjectAttendanceCfg 项目考勤配置
+     * @return 结果
+     */
+    public int updateSurProjectAttendanceCfg(SurProjectAttendanceCfg quartzProjectAttendanceCfg);
+
+    /**
+     * 批量删除项目考勤配置
+     *
+     * @param ids 需要删除的项目考勤配置主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceCfgByIds(Long[] ids);
+
+    /**
+     * 删除项目考勤配置信息
+     *
+     * @param id 项目考勤配置主键
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceCfgById(Long id);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/ISurProjectAttendanceDataService.java

@@ -0,0 +1,141 @@
+package com.yanzhu.xd.system.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.yanzhu.xd.system.domain.SurProjectAttendanceData;
+
+/**
+ * 考勤数据Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public interface ISurProjectAttendanceDataService 
+{
+    /**
+     * 查询劳务实名制管理
+     *
+     * @param id 劳务实名制管理主键
+     * @return 劳务实名制管理
+     */
+    public SurProjectAttendanceData selectSurProjectAttendanceDataById(Long id);
+
+    /**
+     * 查询劳务实名制管理列表
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 劳务实名制管理集合
+     */
+    public List<SurProjectAttendanceData> selectSurProjectAttendanceDataList(SurProjectAttendanceData quartzProjectAttendanceData);
+
+    /**
+     * 查询考勤信息
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 劳务实名制管理集合
+     */
+    public SurProjectAttendanceData findCurrentAttendanceData(SurProjectAttendanceData quartzProjectAttendanceData);
+
+    public List<SurProjectAttendanceData> selectSurProjectAttendanceDataListEx(SurProjectAttendanceData quartzProjectAttendanceData);
+
+    /**
+     * 新增劳务实名制管理
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 结果
+     */
+    public int insertSurProjectAttendanceData(SurProjectAttendanceData quartzProjectAttendanceData);
+
+    /**
+     * 修改劳务实名制管理
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 结果
+     */
+    public int updateSurProjectAttendanceData(SurProjectAttendanceData quartzProjectAttendanceData);
+
+    /**
+     * 批量删除劳务实名制管理
+     *
+     * @param ids 需要删除的劳务实名制管理主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceDataByIds(Long[] ids);
+
+    /**
+     * 删除劳务实名制管理信息
+     *
+     * @param id 劳务实名制管理主键
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceDataById(Long id);
+
+    /**
+     * 批量删除劳务实名制管理
+     *
+     * @param list 需要删除的数据参数集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceDataByParams(List<String> list);
+
+    /**
+     * 批量新增劳务实名制考勤管理
+     *
+     * @param quartzProjectAttendanceDataList 劳务实名制管理考勤列表
+     * @return 结果
+     */
+    public int batchSurProjectAttendanceData(List<SurProjectAttendanceData> quartzProjectAttendanceDataList);
+
+    public void add(SurProjectAttendanceData sdata);
+
+    public String getLastServerId(SurProjectAttendanceData where);
+
+    public List<SurProjectAttendanceData> groupByComany(SurProjectAttendanceData where);
+
+    public Long getHuazhuPage( SurProjectAttendanceData where);
+
+    public List<SurProjectAttendanceData> groupAllByComany(SurProjectAttendanceData where);
+
+    public List<Map<String,Object>> initOtherData(Map<String,Object> data);
+
+    public List<Map<String,Object>> initHuaZhuData(Map<String,Object> data);
+
+    List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where);
+
+    /**
+     * 统计所有数据
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> groupAllByParams(SurProjectAttendanceData where);
+
+    /**
+     * 统计人员数据
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> findGroupAllByDays(SurProjectAttendanceData where);
+
+    /**
+     * 考勤数据列表
+     * @param where
+     * @return
+     */
+    public List<SurProjectAttendanceData> attendanceDataList(SurProjectAttendanceData where);
+
+    /**
+     * 统计考勤数据
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> groupDataByParams(SurProjectAttendanceData where);
+
+    List<SurProjectAttendanceData> groupTodayCompanyTypeId(SurProjectAttendanceData where);
+
+    /**
+     * 指增加
+     * @param addList
+     */
+    void addList(List<SurProjectAttendanceData> addList);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/ISurProjectAttendanceGroupService.java

@@ -0,0 +1,93 @@
+package com.yanzhu.xd.system.service;
+
+import java.util.List;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceGroup;
+
+/**
+ * 班组信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public interface ISurProjectAttendanceGroupService 
+{
+    /**
+     * 查询广联达班组信息
+     *
+     * @param id 广联达班组信息主键
+     * @return 广联达班组信息
+     */
+    public SurProjectAttendanceGroup selectSurProjectAttendanceGroupById(Long id);
+
+    /**
+     * 查询广联达班组信息列表
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 广联达班组信息集合
+     */
+    public List<SurProjectAttendanceGroup> selectSurProjectAttendanceGroupViewList(SurProjectAttendanceGroup quartzProjectAttendanceGroup);
+
+    /**
+     * 查询广联达班组信息列表
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 广联达班组信息集合
+     */
+    public List<SurProjectAttendanceGroup> selectSurProjectAttendanceGroupList(SurProjectAttendanceGroup quartzProjectAttendanceGroup);
+
+    /**
+     * 新增广联达班组信息
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    public int insertSurProjectAttendanceGroup(SurProjectAttendanceGroup quartzProjectAttendanceGroup);
+
+    /**
+     * 修改广联达班组信息
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    public int updateSurProjectAttendanceGroup(SurProjectAttendanceGroup quartzProjectAttendanceGroup);
+
+    /**
+     * 批量删除广联达班组信息
+     *
+     * @param ids 需要删除的广联达班组信息主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceGroupByIds(Long[] ids);
+
+    /**
+     * 删除广联达班组信息信息
+     *
+     * @param id 广联达班组信息主键
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceGroupById(Long id);
+
+    /**
+     * 批量删除广联达班组信息
+     *
+     * @param list 需要删除的数据参数集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceGroupByParams(List<String> list);
+
+    /**
+     * 批量新增广联达班组信息
+     *
+     * @param quartzProjectAttendanceGroupList 广联达班组信息列表
+     * @return 结果
+     */
+    public int batchSurProjectAttendanceGroup(List<SurProjectAttendanceGroup> quartzProjectAttendanceGroupList);
+
+    public void add(SurProjectAttendanceGroup group);
+
+    /**
+     * 更新济工网的分组类型
+     * @param group
+     */
+    public void updateJgw(SurProjectAttendanceGroup group);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/ISurProjectAttendanceUserService.java

@@ -0,0 +1,161 @@
+package com.yanzhu.xd.system.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.yanzhu.xd.system.domain.SurProjectAttendanceUser;
+
+/**
+ * 实名制人员Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public interface ISurProjectAttendanceUserService 
+{
+    /**
+     * 查询考勤人员基本属性
+     *
+     * @param id 考勤人员基本属性主键
+     * @return 考勤人员基本属性
+     */
+    public SurProjectAttendanceUser selectSurProjectAttendanceUserById(Long id);
+
+    /**
+     * 查询考勤人员信息
+     *
+     * @param quartzProjectAttendanceUser
+     * @return 考勤人员基本属性
+     */
+    public SurProjectAttendanceUser findCurrentAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    /**
+     * 查询[研筑]考勤人员信息
+     *
+     * @param quartzProjectAttendanceUser
+     * @return 考勤人员基本属性
+     */
+    public SurProjectAttendanceUser findYzCurrentAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    /**
+     * 查询考勤人员基本属性列表
+     *
+     * @param quartzProjectAttendanceUser 考勤人员基本属性
+     * @return 考勤人员基本属性集合
+     */
+    public List<SurProjectAttendanceUser> selectSurProjectAttendanceUserList(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    /**
+     * 新增考勤人员基本属性
+     *
+     * @param quartzProjectAttendanceUser 考勤人员基本属性
+     * @return 结果
+     */
+    public int insertSurProjectAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    /**
+     * 修改考勤人员基本属性
+     *
+     * @param quartzProjectAttendanceUser 考勤人员基本属性
+     * @return 结果
+     */
+    public int updateSurProjectAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    /**
+     * 批量删除考勤人员基本属性
+     *
+     * @param ids 需要删除的考勤人员基本属性主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceUserByIds(Long[] ids);
+
+    /**
+     * 删除考勤人员基本属性信息
+     *
+     * @param id 考勤人员基本属性主键
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceUserById(Long id);
+
+    /**
+     * 批量删除考勤人员基本属性
+     *
+     * @param list 需要删除的数据参数集合
+     * @return 结果
+     */
+    public int deleteSurProjectAttendanceUserByParams(List<String> list);
+
+    /**
+     * 批量新增考勤人员基本属性
+     *
+     * @param quartzProjectAttendanceUserList 考勤人员基本属性列表
+     * @return 结果
+     */
+    public int batchSurProjectAttendanceUser(List<SurProjectAttendanceUser> quartzProjectAttendanceUserList);
+
+    public void add(SurProjectAttendanceUser user);
+
+    public  List<SurProjectAttendanceUser> queryAttendanceData(SurProjectAttendanceUser where);
+
+    public long countTodayAttendance(SurProjectAttendanceUser where);
+
+    public List<SurProjectAttendanceUser> todayAttendance(SurProjectAttendanceUser where);
+
+    public long countAttendance(SurProjectAttendanceUser where);
+
+    /**
+     * 济工网人员查询
+     * @param quartzProjectAttendanceUser
+     * @return
+     */
+    public List<SurProjectAttendanceUser> selectSurProjectAttendanceUserListJgw(SurProjectAttendanceUser quartzProjectAttendanceUser);
+
+    /**
+     * 在岗工人查询
+     * @param where
+     * @return
+     */
+    public List<SurProjectAttendanceUser> queryWorkerOnDuty(SurProjectAttendanceUser where);
+
+    /**
+     * 统计人员数据
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> groupUserByParams(SurProjectAttendanceUser where);
+
+    /**
+     * 在岗工人查询
+     * @param where
+     * @return
+     */
+    public List<SurProjectAttendanceUser> attendanceUserList(SurProjectAttendanceUser where);
+
+    /**
+     * 统计人员数据
+     * @param projectId
+     * @return
+     */
+    public List<Map<String, Object>> findUserAllByDays(Long projectId);
+
+    /**
+     * 按部门汇总在岗人数
+     * @param where
+     * @return
+     */
+    List<SurProjectAttendanceUser> groupByWorkerOnDutyByDept(SurProjectAttendanceUser where);
+
+    List<SurProjectAttendanceUser> querySurProjectAttendanceUserList(SurProjectAttendanceUser quartzProjectAttendanceUser);
+    /**
+     * 按部门汇总在岗|离岗人数
+     * @param where
+     * @return
+     */
+    List<SurProjectAttendanceUser> groupByWorkerByDept(SurProjectAttendanceUser where);
+    /**
+     * 在岗|离岗工人查询
+     * @param where
+     * @return
+     */
+    List<SurProjectAttendanceUser> queryWorkerByState(SurProjectAttendanceUser where);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/ISurProjectService.java

@@ -0,0 +1,61 @@
+package com.yanzhu.xd.system.service;
+
+import java.util.List;
+import com.yanzhu.xd.system.domain.SurProject;
+
+/**
+ * 项目Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+public interface ISurProjectService 
+{
+    /**
+     * 查询项目
+     * 
+     * @param id 项目ID
+     * @return 项目
+     */
+    public SurProject selectSurProjectById(Long id);
+
+    /**
+     * 查询项目列表
+     * 
+     * @param surProject 项目
+     * @return 项目集合
+     */
+    public List<SurProject> selectSurProjectList(SurProject surProject);
+
+    /**
+     * 新增项目
+     * 
+     * @param surProject 项目
+     * @return 结果
+     */
+    public int insertSurProject(SurProject surProject);
+
+    /**
+     * 修改项目
+     * 
+     * @param surProject 项目
+     * @return 结果
+     */
+    public int updateSurProject(SurProject surProject);
+
+    /**
+     * 批量删除项目
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSurProjectByIds(String ids);
+
+    /**
+     * 删除项目信息
+     * 
+     * @param id 项目ID
+     * @return 结果
+     */
+    public int deleteSurProjectById(Long id);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/ISysNativeService.java

@@ -0,0 +1,63 @@
+package com.yanzhu.xd.system.service;
+
+import java.util.List;
+import com.yanzhu.xd.system.domain.SysNative;
+
+/**
+ * 省市县Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-10-26
+ */
+public interface ISysNativeService 
+{
+    /**
+     * 查询省市县
+     * 
+     * @param id 省市县ID
+     * @return 省市县
+     */
+    public SysNative selectSysNativeById(Long id);
+
+    /**
+     * 查询省市县列表
+     * 
+     * @param sysNative 省市县
+     * @return 省市县集合
+     */
+    public List<SysNative> selectSysNativeList(SysNative sysNative);
+
+    /**
+     * 新增省市县
+     * 
+     * @param sysNative 省市县
+     * @return 结果
+     */
+    public int insertSysNative(SysNative sysNative);
+
+    /**
+     * 修改省市县
+     * 
+     * @param sysNative 省市县
+     * @return 结果
+     */
+    public int updateSysNative(SysNative sysNative);
+
+    /**
+     * 批量删除省市县
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSysNativeByIds(String ids);
+
+    /**
+     * 删除省市县信息
+     * 
+     * @param id 省市县ID
+     * @return 结果
+     */
+    public int deleteSysNativeById(Long id);
+
+    List<SysNative> selectSysNativeListById(long id);
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/impl/DevTowerProjectConfigServiceImpl.java

@@ -0,0 +1,139 @@
+package com.yanzhu.xd.system.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import com.yanzhu.xd.system.domain.DevTowerProjectConfig;
+import com.yanzhu.xd.system.mapper.DevTowerProjectConfigMapper;
+import com.yanzhu.xd.system.service.IDevTowerProjectConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔基检测配置Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@Service
+public class DevTowerProjectConfigServiceImpl implements IDevTowerProjectConfigService
+{
+
+    @Autowired
+    private DevTowerProjectConfigMapper devTowerProjectConfigMapper;
+
+    /**
+     * 查询塔基检测配置
+     * 
+     * @param id 塔基检测配置主键
+     * @return 塔基检测配置
+     */
+    @Override
+    public DevTowerProjectConfig selectDevTowerProjectConfigById(Long id)
+    {
+        return devTowerProjectConfigMapper.selectDevTowerProjectConfigById(id);
+    }
+
+    /**
+     * 查询塔基检测配置
+     *
+     * @param sn 塔基序列号
+     * @return 塔基检测配置
+     */
+    @Override
+    public DevTowerProjectConfig selectDevTowerProjectConfigBySn(String sn){
+        return devTowerProjectConfigMapper.selectDevTowerProjectConfigBySn(sn);
+    }
+
+    /**
+     * 查询塔基检测配置列表
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 塔基检测配置
+     */
+    @Override
+    public List<DevTowerProjectConfig> selectDevTowerProjectConfigList(DevTowerProjectConfig devTowerProjectConfig)
+    {
+        return devTowerProjectConfigMapper.selectDevTowerProjectConfigList(devTowerProjectConfig);
+    }
+
+    /**
+     * 新增塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    @Override
+    public int insertDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig)
+    {
+        devTowerProjectConfig.setCreateBy(ShiroUtils.getLoginName());
+        devTowerProjectConfig.setCreateTime(DateUtils.getNowDate());
+        int res = devTowerProjectConfigMapper.insertDevTowerProjectConfig(devTowerProjectConfig);
+        return res;
+    }
+
+    /**
+     * 修改塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    @Override
+    public int updateDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig)
+    {
+        devTowerProjectConfig.setUpdateBy(ShiroUtils.getLoginName());
+        devTowerProjectConfig.setUpdateTime(DateUtils.getNowDate());
+        int res = devTowerProjectConfigMapper.updateDevTowerProjectConfig(devTowerProjectConfig);
+        return res;
+    }
+
+    /**
+     * 修改塔基检测配置
+     *
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    @Override
+    public int updateDevTowerProjectConfigNoCache(DevTowerProjectConfig devTowerProjectConfig)
+    {
+        devTowerProjectConfig.setUpdateTime(DateUtils.getNowDate());
+        return devTowerProjectConfigMapper.updateDevTowerProjectConfig(devTowerProjectConfig);
+    }
+
+    /**
+     * 批量删除塔基检测配置
+     * 
+     * @param ids 需要删除的塔基检测配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerProjectConfigByIds(Long[] ids)
+    {
+        int res = devTowerProjectConfigMapper.deleteDevTowerProjectConfigByIds(ids);
+        return res;
+    }
+
+    /**
+     * 删除塔基检测配置信息
+     * 
+     * @param id 塔基检测配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerProjectConfigById(Long id)
+    {
+        int res = devTowerProjectConfigMapper.deleteDevTowerProjectConfigById(id);
+        return res;
+    }
+
+    /**
+     * 根据设备状态统计设备
+     * @param devTowerProjectConfig
+     * @return
+     */
+    public List<Map<String, Object>> findtowerConfigGroupOnline(DevTowerProjectConfig devTowerProjectConfig){
+        return devTowerProjectConfigMapper.findtowerConfigGroupOnline(devTowerProjectConfig);
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/impl/SurProjectAttendanceCfgServiceImpl.java

@@ -0,0 +1,112 @@
+package com.yanzhu.xd.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.DateUtils;
+import com.yanzhu.xd.system.utils.SecurityTools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.xd.system.mapper.SurProjectAttendanceCfgMapper;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceCfg;
+import com.yanzhu.xd.system.service.ISurProjectAttendanceCfgService;
+
+
+/**
+ * 考勤配置Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+@Service
+public class SurProjectAttendanceCfgServiceImpl implements ISurProjectAttendanceCfgService 
+{
+
+
+    @Autowired
+    private SurProjectAttendanceCfgMapper attendanceCfgMapper;
+
+    /**
+     * 查询项目考勤配置
+     *
+     * @param id 项目考勤配置主键
+     * @return 项目考勤配置
+     */
+    @Override
+    public SurProjectAttendanceCfg selectSurProjectAttendanceCfgById(Long id)
+    {
+        return attendanceCfgMapper.selectSurProjectAttendanceCfgById(id);
+    }
+
+    /**
+     * 查询项目考勤配置列表
+     *
+     * @param quartzProjectAttendanceCfg 项目考勤配置
+     * @return 项目考勤配置
+     */
+    @Override
+    public List<SurProjectAttendanceCfg> selectSurProjectAttendanceCfgList(SurProjectAttendanceCfg quartzProjectAttendanceCfg)
+    {
+        return attendanceCfgMapper.selectSurProjectAttendanceCfgList(quartzProjectAttendanceCfg);
+    }
+
+    /**
+     * 新增项目考勤配置
+     *
+     * @param quartzProjectAttendanceCfg 项目考勤配置
+     * @return 结果
+     */
+    @Override
+    public int insertSurProjectAttendanceCfg(SurProjectAttendanceCfg quartzProjectAttendanceCfg)
+    {
+        String userName= SecurityTools.getUsername();
+        quartzProjectAttendanceCfg.setCreateBy(StrUtil.isEmpty(userName)?"task":userName);
+        quartzProjectAttendanceCfg.setCreateTime(DateUtils.getNowDate());
+        return attendanceCfgMapper.insertSurProjectAttendanceCfg(quartzProjectAttendanceCfg);
+    }
+
+    /**
+     * 修改项目考勤配置
+     *
+     * @param quartzProjectAttendanceCfg 项目考勤配置
+     * @return 结果
+     */
+    @Override
+    public int updateSurProjectAttendanceCfg(SurProjectAttendanceCfg quartzProjectAttendanceCfg)
+    {
+        String userName= SecurityTools.getUsername();
+        quartzProjectAttendanceCfg.setUpdateBy(StrUtil.isEmpty(userName)?"task":userName);
+        quartzProjectAttendanceCfg.setUpdateTime(DateUtils.getNowDate());
+        return attendanceCfgMapper.updateSurProjectAttendanceCfg(quartzProjectAttendanceCfg);
+    }
+
+    /**
+     * 批量删除项目考勤配置
+     *
+     * @param ids 需要删除的项目考勤配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceCfgByIds(Long[] ids)
+    {
+        List<Long> cfgIds = new ArrayList<>();
+        for(Long id:ids){
+            SurProjectAttendanceCfg quartzProjectAttendanceCfg = attendanceCfgMapper.selectSurProjectAttendanceCfgById(id);
+        }
+        return attendanceCfgMapper.deleteSurProjectAttendanceCfgByIds(ids);
+    }
+
+    /**
+     * 删除项目考勤配置信息
+     *
+     * @param id 项目考勤配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceCfgById(Long id)
+    {
+        SurProjectAttendanceCfg quartzProjectAttendanceCfg = attendanceCfgMapper.selectSurProjectAttendanceCfgById(id);
+        return attendanceCfgMapper.deleteSurProjectAttendanceCfgById(id);
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/impl/SurProjectAttendanceDataServiceImpl.java

@@ -0,0 +1,520 @@
+package com.yanzhu.xd.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceCfg;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceGroup;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceUser;
+import com.yanzhu.xd.system.mapper.SurProjectAttendanceCfgMapper;
+import com.yanzhu.xd.system.mapper.SurProjectAttendanceGroupMapper;
+import com.yanzhu.xd.system.mapper.SurProjectAttendanceUserMapper;
+import com.yanzhu.xd.system.utils.SecurityTools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.xd.system.mapper.SurProjectAttendanceDataMapper;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceData;
+import com.yanzhu.xd.system.service.ISurProjectAttendanceDataService;
+
+/**
+ * 考勤数据Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+@Service
+public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanceDataService 
+{
+    @Autowired
+    private SurProjectAttendanceDataMapper attendanceDataMapper;
+
+    @Autowired
+    private SurProjectAttendanceUserMapper attendanceUserMapper;
+
+    @Autowired
+    private SurProjectAttendanceGroupMapper attendanceGroupMapper;
+
+    @Autowired
+    private SurProjectAttendanceCfgMapper attendanceCfgMapper;
+
+
+    /**
+     * 查询劳务实名制管理
+     *
+     * @param id 劳务实名制管理主键
+     * @return 劳务实名制管理
+     */
+    @Override
+    public SurProjectAttendanceData selectSurProjectAttendanceDataById(Long id)
+    {
+        return attendanceDataMapper.selectSurProjectAttendanceDataById(id);
+    }
+
+    /**
+     * 查询劳务实名制管理列表
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 劳务实名制管理
+     */
+    @Override
+    public List<SurProjectAttendanceData> selectSurProjectAttendanceDataList(SurProjectAttendanceData quartzProjectAttendanceData)
+    {
+        return attendanceDataMapper.selectSurProjectAttendanceDataList(quartzProjectAttendanceData);
+    }
+
+    /**
+     * 查询考勤信息
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 劳务实名制管理集合
+     */
+    @Override
+    public SurProjectAttendanceData findCurrentAttendanceData(SurProjectAttendanceData quartzProjectAttendanceData){
+        return attendanceDataMapper.findCurrentAttendanceData(quartzProjectAttendanceData);
+    }
+
+    @Override
+    public List<SurProjectAttendanceData> selectSurProjectAttendanceDataListEx(SurProjectAttendanceData quartzProjectAttendanceData)
+    {
+        return attendanceDataMapper.selectSurProjectAttendanceDataListEx(quartzProjectAttendanceData);
+    }
+
+    /**
+     * 新增劳务实名制管理
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 结果
+     */
+    @Override
+    public int insertSurProjectAttendanceData(SurProjectAttendanceData quartzProjectAttendanceData)
+    {
+        String userName= SecurityTools.getUsername();
+        quartzProjectAttendanceData.setCreateBy(StrUtil.isEmpty(userName)?"task":userName);
+        quartzProjectAttendanceData.setCreateTime(DateUtils.getNowDate());
+
+        return attendanceDataMapper.insertSurProjectAttendanceData(quartzProjectAttendanceData);
+    }
+
+    /**
+     * 修改劳务实名制管理
+     *
+     * @param quartzProjectAttendanceData 劳务实名制管理
+     * @return 结果
+     */
+    @Override
+    public int updateSurProjectAttendanceData(SurProjectAttendanceData quartzProjectAttendanceData)
+    {
+        String userName= SecurityTools.getUsername();
+        quartzProjectAttendanceData.setUpdateBy(StrUtil.isEmpty(userName)?"task":userName);
+
+        quartzProjectAttendanceData.setUpdateTime(DateUtils.getNowDate());
+        return attendanceDataMapper.updateSurProjectAttendanceData(quartzProjectAttendanceData);
+    }
+
+    /**
+     * 批量删除劳务实名制管理
+     *
+     * @param ids 需要删除的劳务实名制管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceDataByIds(Long[] ids)
+    {
+        return attendanceDataMapper.deleteSurProjectAttendanceDataByIds(ids);
+    }
+
+    /**
+     * 删除劳务实名制管理信息
+     *
+     * @param id 劳务实名制管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceDataById(Long id)
+    {
+        return attendanceDataMapper.deleteSurProjectAttendanceDataById(id);
+    }
+
+    /**
+     * 批量删除劳务实名制管理
+     *
+     * @param list 需要删除的数据参数集合
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceDataByParams(List<String> list) {
+        return attendanceDataMapper.deleteSurProjectAttendanceDataByParams(list);
+    }
+
+    /**
+     * 批量新增劳务实名制考勤管理
+     *
+     * @param quartzProjectAttendanceDataList 劳务实名制考勤管理列表
+     * @return 结果
+     */
+    @Override
+    public int batchSurProjectAttendanceData(List<SurProjectAttendanceData> quartzProjectAttendanceDataList) {
+        return attendanceDataMapper.batchSurProjectAttendanceData(quartzProjectAttendanceDataList,DateUtils.dateTimeNow(DateUtils.YYYY));
+    }
+
+    @Override
+    public void add(SurProjectAttendanceData sdata) {
+        if(StringUtils.isEmpty(sdata.getWorkerId()) || StringUtils.isEmpty(sdata.getAttendanceTime())){
+            return;
+        }
+        SurProjectAttendanceData where=new SurProjectAttendanceData();
+        where.setVendorsCode(sdata.getVendorsCode());
+        where.setCfgid(sdata.getCfgid());
+        where.setWorkerId(sdata.getWorkerId());
+        where.setAttendanceTime(sdata.getAttendanceTime());
+        List<SurProjectAttendanceData> list=selectSurProjectAttendanceDataListEx(where);
+        if(list.size()==0){
+            //设置考勤其它参数
+            //查询人员信息
+            SurProjectAttendanceUser userWhere=new SurProjectAttendanceUser();
+            userWhere.setWorkerId(sdata.getWorkerId());
+            List<SurProjectAttendanceUser> uList= attendanceUserMapper.selectSurProjectAttendanceUserList(userWhere);
+            if(uList.size()==0){
+                return;
+            }
+            SurProjectAttendanceUser user=uList.get(0);
+            sdata.setWorkerName(user.getName());
+            String photo=user.getPhoto();
+            if(StrUtil.isEmpty(photo)){
+                photo=user.getRecentPhoto();
+            }
+
+            sdata.setWorkerPhoto(photo);
+            sdata.setWorkerGender(user.getGender());;
+            sdata.setGroupName(user.getGroupName());
+            sdata.setWorkTypeName(user.getWorkTypeName());
+            sdata.setEthnic(user.getEthnic());
+            sdata.setNativePlace(user.getNativePlace());
+            sdata.setPhone(user.getPhone());
+            sdata.setSpecWorkType(user.getSpecWorkType());
+            if("jgw".equals(sdata.getVendorsCode())) {
+                sdata.setCompanyId(user.getCompanyId());
+            }
+            //查询分组信息
+            SurProjectAttendanceGroup groupWhere=new SurProjectAttendanceGroup();
+            groupWhere.setCfgid(sdata.getCfgid());
+            groupWhere.setCompanyId(sdata.getCompanyId());
+            List<SurProjectAttendanceGroup> gList= attendanceGroupMapper.selectSurProjectAttendanceGroupList(groupWhere);
+            if(gList.size()==0){
+                return;
+            }
+            SurProjectAttendanceGroup group=gList.get(0);
+            sdata.setCompanyName(group.getCompanyName());
+            sdata.setCompanyTypeId(group.getCompanyTypeId());
+            //查询华筑的分组信息
+            if("huazhu".equals(sdata.getVendorsCode())){
+                sdata.setWorkerGender(sdata.getWorkerGender());
+                sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型
+            }
+            if("jgw".equals(sdata.getVendorsCode())){
+                //sdata.setWorkTypeName(group.getCompanyCode());
+                //sdata.setCompanyName(user.getCompanyName());
+                sdata.setWorkTypeName(user.getWorkTypeName());
+                sdata.setCompanyName(group.getCompanyName());
+                sdata.setGroupName(group.getTeamName());
+            }
+            //查询项目部门信息
+            SurProjectAttendanceCfg cfgWhere=new SurProjectAttendanceCfg();
+            cfgWhere.setId(sdata.getCfgid());
+            List<SurProjectAttendanceCfg> cfgList= attendanceCfgMapper.selectSurProjectAttendanceCfgListForAllInfo(cfgWhere);
+            if(cfgList.size()==0){
+                return;
+            }
+            SurProjectAttendanceCfg cfg=cfgList.get(0);
+            sdata.setProjectId(cfg.getProjectId());
+            sdata.setDeptId(cfg.getSubDeptId());
+            sdata.setProjectName(cfg.getProjectName());
+            sdata.setDeptName(cfg.getDeptName());
+            if(sdata.getCompanyTypeId()==null){
+                sdata.setCompanyTypeId("0");
+            }
+            insertSurProjectAttendanceData(sdata);
+        }else{
+            sdata.setId(list.get(0).getId());
+            SurProjectAttendanceData upData=list.get(0);
+            String dt1=upData.getAttendanceTime(); //
+            String dt2=upData.getAttendanceOutTime();
+            String dt3=sdata.getAttendanceTime();
+            if (StrUtil.isEmpty(dt3)) {
+                return;
+            }
+            long time3=DateUtil.parse(dt3).getTime();
+            if(StrUtil.isEmpty(dt2)){
+                upData.setAttendanceOutTime(dt3);
+                //比较 dt1,dt2 进行交换
+                long time2=DateUtil.parse(dt3).getTime();
+                long time1=DateUtil.parse(dt1).getTime();
+                if(time1>time2){
+                    upData.setAttendanceTime(dt3);
+                    upData.setAttendanceOutTime(dt1);
+                }
+            }else{
+                long time2=DateUtil.parse(dt2).getTime();
+                long time1=DateUtil.parse(dt1).getTime();
+                //比较 dt3<dt1 in->dt3
+                if(time3<time1){
+                    upData.setAttendanceTime(dt3);
+                }
+                //比较 dt3>dt2 out->dt3
+                if(time3>time2){
+                    upData.setAttendanceOutTime(dt3);
+                }
+            }
+            //upData.setAttendanceOutTime(sdata.getAttendanceTime());
+            if("jgw".equals(upData.getVendorsCode())){
+                upData.setRemark(sdata.getRemark());
+            }
+            updateSurProjectAttendanceData(upData);
+        }
+    }
+
+    private String getHuazhuCompanyTypeId(String groupName) {
+        return attendanceDataMapper.findHuaZhuCompanyType(groupName);
+    }
+
+    @Override
+    public String getLastServerId(SurProjectAttendanceData where) {
+        return ""+ attendanceDataMapper.getLastServerId(where);
+    }
+
+    @Override
+    public List<SurProjectAttendanceData> groupByComany(SurProjectAttendanceData where) {
+        return attendanceDataMapper.groupByComany(where);
+    }
+
+    @Override
+    public Long getHuazhuPage( SurProjectAttendanceData attWhere) {
+        return attendanceDataMapper.getHuazhuPage(attWhere);
+    }
+
+    @Override
+    public List<SurProjectAttendanceData> groupAllByComany(SurProjectAttendanceData where) {
+        return attendanceDataMapper.groupAllByComany(where);
+    }
+
+    @Override
+    public List<Map<String,Object>> initOtherData(Map<String,Object> data) {
+        List<Map<String,Object>> dataList = new ArrayList<>();
+        List<Map<String,Object>> list = attendanceDataMapper.initOtherData(data);
+        if(StringUtils.isNotEmpty(list)){
+            List<String> workerIds = list.stream().map(Map -> Map.get("workerId").toString()).collect(Collectors.toList());
+            data.put("list",workerIds);
+            List<SurProjectAttendanceUser> datas= attendanceUserMapper.todayAttendanceOtherData(data);
+            for (Map<String,Object> map:list) {
+                for(SurProjectAttendanceUser sau:datas){
+                    if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){
+                        map.put("inTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getInTime()));
+                        map.put("outTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getOutTime()));
+                        dataList.add(map);
+                    }
+                }
+            }
+        }
+        return dataList;
+    }
+
+    @Override
+    public List<Map<String,Object>> initHuaZhuData(Map<String,Object> data) {
+        List<Map<String,Object>> dataList = new ArrayList<>();
+        List<Map<String,Object>> list = attendanceDataMapper.initHuaZhuData(data);
+        if(StringUtils.isNotEmpty(list)){
+            List<String> workerIds = list.stream().map(Map -> Map.get("workerId").toString()).collect(Collectors.toList());
+            data.put("list",workerIds);
+            List<SurProjectAttendanceUser> datas= attendanceUserMapper.todayAttendanceOtherData(data);
+            for (Map<String,Object> map:list) {
+                for(SurProjectAttendanceUser sau:datas){
+                    if(Objects.equals(map.get("workerId").toString(),sau.getWorkerId())){
+                        map.put("inTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getInTime()));
+                        map.put("outTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sau.getOutTime()));
+                        dataList.add(map);
+                    }
+                }
+            }
+        }
+        return dataList;
+    }
+
+    @Override
+    public List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where) {
+        return attendanceDataMapper.todayAttendance(where);
+    }
+
+    /**
+     * 统计所有数据
+     * @param where
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> groupAllByParams(SurProjectAttendanceData where) {
+        return attendanceDataMapper.findGroupAllByParams(where);
+    }
+
+    /**
+     * 统计人员数据
+     * @param where
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> findGroupAllByDays(SurProjectAttendanceData where){
+        return attendanceDataMapper.findGroupAllByDays(where);
+    }
+
+    /**
+     * 统计考勤数据
+     * @param where
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> groupDataByParams(SurProjectAttendanceData where){
+        return attendanceDataMapper.groupDataByParams(where);
+    }
+
+    /**
+     * 考勤数据列表
+     * @param where
+     * @return
+     */
+    @Override
+    public List<SurProjectAttendanceData> attendanceDataList(SurProjectAttendanceData where) {
+        return attendanceDataMapper.attendanceDataList(where);
+    }
+
+    @Override
+    public List<SurProjectAttendanceData> groupTodayCompanyTypeId(SurProjectAttendanceData where) {
+        return attendanceDataMapper.groupTodayCompanyTypeId(where);
+    }
+
+    /**
+     * 批量增加
+     * @param addList
+     */
+    @Override
+    public void addList(List<SurProjectAttendanceData> addList) {
+        if(addList.size()==0){
+            return;
+        }
+        SurProjectAttendanceData where=new SurProjectAttendanceData();
+        where.setVendorsCode(addList.get(0).getVendorsCode());
+        where.setCfgid(addList.get(0).getCfgid());
+        where.setAttendanceTime(addList.get(0).getAttendanceTime());
+        List<SurProjectAttendanceData> oldList=selectSurProjectAttendanceDataListEx(where);
+        for(SurProjectAttendanceData sdata:addList){
+            List<SurProjectAttendanceData> list=oldList.stream().filter(d->d.getWorkerId().equals(sdata.getWorkerId())).collect(Collectors.toList());
+            if(list.size()==0){
+                //设置考勤其它参数
+                //查询人员信息
+                SurProjectAttendanceUser userWhere=new SurProjectAttendanceUser();
+                userWhere.setWorkerId(sdata.getWorkerId());
+                List<SurProjectAttendanceUser> uList= attendanceUserMapper.selectSurProjectAttendanceUserList(userWhere);
+                if(uList.size()==0){
+                    return;
+                }
+                SurProjectAttendanceUser user=uList.get(0);
+                sdata.setWorkerName(user.getName());
+                String photo=user.getPhoto();
+                if(StrUtil.isEmpty(photo)){
+                    photo=user.getRecentPhoto();
+                }
+
+                sdata.setWorkerPhoto(photo);
+                sdata.setWorkerGender(user.getGender());;
+                sdata.setGroupName(user.getGroupName());
+                sdata.setWorkTypeName(user.getWorkTypeName());
+                sdata.setEthnic(user.getEthnic());
+                sdata.setNativePlace(user.getNativePlace());
+                sdata.setPhone(user.getPhone());
+                sdata.setSpecWorkType(user.getSpecWorkType());
+                if("jgw".equals(sdata.getVendorsCode())) {
+                    sdata.setCompanyId(user.getCompanyId());
+                }
+                //查询分组信息
+                SurProjectAttendanceGroup groupWhere=new SurProjectAttendanceGroup();
+                groupWhere.setCfgid(sdata.getCfgid());
+                groupWhere.setCompanyId(sdata.getCompanyId());
+                List<SurProjectAttendanceGroup> gList= attendanceGroupMapper.selectSurProjectAttendanceGroupList(groupWhere);
+                if(gList.size()==0){
+                    return;
+                }
+                SurProjectAttendanceGroup group=gList.get(0);
+                sdata.setCompanyName(group.getCompanyName());
+                sdata.setCompanyTypeId(group.getCompanyTypeId());
+                //查询华筑的分组信息
+                if("huazhu".equals(sdata.getVendorsCode())){
+                    sdata.setWorkerGender(sdata.getWorkerGender());
+                    sdata.setCompanyTypeId(getHuazhuCompanyTypeId(group.getCompanyName()));//获取华筑的分包商类型
+                }
+                if("jgw".equals(sdata.getVendorsCode())){
+                    //sdata.setWorkTypeName(group.getCompanyCode());
+                    //sdata.setCompanyName(user.getCompanyName());
+                    sdata.setWorkTypeName(user.getWorkTypeName());
+                    sdata.setCompanyName(group.getCompanyName());
+                    sdata.setGroupName(group.getTeamName());
+                }
+                //查询项目部门信息
+                SurProjectAttendanceCfg cfgWhere=new SurProjectAttendanceCfg();
+                cfgWhere.setId(sdata.getCfgid());
+                List<SurProjectAttendanceCfg> cfgList= attendanceCfgMapper.selectSurProjectAttendanceCfgListForAllInfo(cfgWhere);
+                if(cfgList.size()==0){
+                    return;
+                }
+                SurProjectAttendanceCfg cfg=cfgList.get(0);
+                sdata.setProjectId(cfg.getProjectId());
+                sdata.setDeptId(cfg.getSubDeptId());
+                sdata.setProjectName(cfg.getProjectName());
+                sdata.setDeptName(cfg.getDeptName());
+                if(sdata.getCompanyTypeId()==null){
+                    sdata.setCompanyTypeId("0");
+                }
+                insertSurProjectAttendanceData(sdata);
+            }else{
+                sdata.setId(list.get(0).getId());
+                SurProjectAttendanceData upData=list.get(0);
+                String dt1=upData.getAttendanceTime(); //
+                String dt2=upData.getAttendanceOutTime();
+                String dt3=sdata.getAttendanceTime();
+                if (StrUtil.isEmpty(dt3)) {
+                    return;
+                }
+                long time3=DateUtil.parse(dt3).getTime();
+                if(StrUtil.isEmpty(dt2)){
+                    upData.setAttendanceOutTime(dt3);
+                    //比较 dt1,dt2 进行交换
+                    long time2=DateUtil.parse(dt3).getTime();
+                    long time1=DateUtil.parse(dt1).getTime();
+                    if(time1>time2){
+                        upData.setAttendanceTime(dt3);
+                        upData.setAttendanceOutTime(dt1);
+                    }
+                }else{
+                    long time2=DateUtil.parse(dt2).getTime();
+                    long time1=DateUtil.parse(dt1).getTime();
+                    //比较 dt3<dt1 in->dt3
+                    if(time3<time1){
+                        upData.setAttendanceTime(dt3);
+                    }
+                    //比较 dt3>dt2 out->dt3
+                    if(time3>time2){
+                        upData.setAttendanceOutTime(dt3);
+                    }
+                }
+                //upData.setAttendanceOutTime(sdata.getAttendanceTime());
+                if("jgw".equals(upData.getVendorsCode())){
+                    upData.setRemark(sdata.getRemark());
+                }
+                updateSurProjectAttendanceData(upData);
+            }
+        }
+    }
+
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/impl/SurProjectAttendanceGroupServiceImpl.java

@@ -0,0 +1,165 @@
+package com.yanzhu.xd.system.service.impl;
+
+import java.util.List;
+
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.DateUtils;
+import com.yanzhu.xd.system.utils.SecurityTools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.xd.system.mapper.SurProjectAttendanceGroupMapper;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceGroup;
+import com.yanzhu.xd.system.service.ISurProjectAttendanceGroupService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 班组信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+@Service
+public class SurProjectAttendanceGroupServiceImpl implements ISurProjectAttendanceGroupService 
+{
+    @Autowired
+    private SurProjectAttendanceGroupMapper attendanceGroupMapper;
+
+    /**
+     * 查询广联达班组信息
+     *
+     * @param id 广联达班组信息主键
+     * @return 广联达班组信息
+     */
+    @Override
+    public SurProjectAttendanceGroup selectSurProjectAttendanceGroupById(Long id)
+    {
+        return attendanceGroupMapper.selectSurProjectAttendanceGroupById(id);
+    }
+
+    /**
+     * 查询广联达班组信息列表
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 广联达班组信息
+     */
+    @Override
+    public List<SurProjectAttendanceGroup> selectSurProjectAttendanceGroupViewList(SurProjectAttendanceGroup quartzProjectAttendanceGroup)
+    {
+        return attendanceGroupMapper.selectSurProjectAttendanceGroupViewList(quartzProjectAttendanceGroup);
+    }
+
+    /**
+     * 查询广联达班组信息列表
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 广联达班组信息集合
+     */
+    public List<SurProjectAttendanceGroup> selectSurProjectAttendanceGroupList(SurProjectAttendanceGroup quartzProjectAttendanceGroup) {
+        return attendanceGroupMapper.selectSurProjectAttendanceGroupList(quartzProjectAttendanceGroup);
+    }
+    /**
+     * 新增广联达班组信息
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    @Override
+    public int insertSurProjectAttendanceGroup(SurProjectAttendanceGroup quartzProjectAttendanceGroup)
+    {
+        String userName= SecurityTools.getUsername();
+        quartzProjectAttendanceGroup.setCreateBy(StrUtil.isEmpty(userName)?"task":userName);
+        quartzProjectAttendanceGroup.setCreateTime(DateUtils.getNowDate());
+        return attendanceGroupMapper.insertSurProjectAttendanceGroup(quartzProjectAttendanceGroup);
+    }
+
+    /**
+     * 修改广联达班组信息
+     *
+     * @param quartzProjectAttendanceGroup 广联达班组信息
+     * @return 结果
+     */
+    @Override
+    public int updateSurProjectAttendanceGroup(SurProjectAttendanceGroup quartzProjectAttendanceGroup)
+    {
+        String userName= SecurityTools.getUsername();
+        quartzProjectAttendanceGroup.setUpdateBy(StrUtil.isEmpty(userName)?"task":userName);
+
+        quartzProjectAttendanceGroup.setUpdateTime(DateUtils.getNowDate());
+        return attendanceGroupMapper.updateSurProjectAttendanceGroup(quartzProjectAttendanceGroup);
+    }
+
+    /**
+     * 批量删除广联达班组信息
+     *
+     * @param ids 需要删除的广联达班组信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceGroupByIds(Long[] ids)
+    {
+        return attendanceGroupMapper.deleteSurProjectAttendanceGroupByIds(ids);
+    }
+
+    /**
+     * 删除广联达班组信息信息
+     *
+     * @param id 广联达班组信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceGroupById(Long id)
+    {
+        return attendanceGroupMapper.deleteSurProjectAttendanceGroupById(id);
+    }
+
+    /**
+     * 批量删除广联达班组信息
+     *
+     * @param list 需要删除的数据参数集合
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceGroupByParams(List<String> list) {
+        return attendanceGroupMapper.deleteSurProjectAttendanceGroupByParams(list);
+    }
+
+    /**
+     * 批量新增广联达班组信息
+     *
+     * @param quartzProjectAttendanceGroupList 广联达班组信息列表
+     * @return 结果
+     */
+    @Override
+    public int batchSurProjectAttendanceGroup(List<SurProjectAttendanceGroup> quartzProjectAttendanceGroupList) {
+        return attendanceGroupMapper.batchSurProjectAttendanceGroup(quartzProjectAttendanceGroupList);
+    }
+
+    @Override
+    public void add(SurProjectAttendanceGroup group) {
+        SurProjectAttendanceGroup where=new SurProjectAttendanceGroup();
+        where.setServerid(group.getServerid());
+        where.setCfgid(group.getCfgid());
+        List<SurProjectAttendanceGroup> list=selectSurProjectAttendanceGroupList(where);
+        if(list.size()==0){
+            insertSurProjectAttendanceGroup(group);
+        }else{
+            group.setId(list.get(0).getId());
+            updateSurProjectAttendanceGroup(group);
+        }
+    }
+
+    /**
+     * 更新济工网的分组类型
+     * @param group
+     */
+    @Override
+    public void updateJgw(SurProjectAttendanceGroup group) {
+        SurProjectAttendanceGroup where=new SurProjectAttendanceGroup();
+        where.setBizLicense(group.getBizLicense());
+        List<SurProjectAttendanceGroup> list=selectSurProjectAttendanceGroupList(where);
+        for(SurProjectAttendanceGroup g:list){
+            g.setCompanyTypeId(group.getCompanyTypeId());
+            updateSurProjectAttendanceGroup(g);
+        }
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/impl/SurProjectAttendanceUserServiceImpl.java

@@ -0,0 +1,314 @@
+package com.yanzhu.xd.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.xd.system.mapper.SurProjectAttendanceUserMapper;
+import com.yanzhu.xd.system.domain.SurProjectAttendanceUser;
+import com.yanzhu.xd.system.service.ISurProjectAttendanceUserService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 实名制人员Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+@Service
+public class SurProjectAttendanceUserServiceImpl implements ISurProjectAttendanceUserService 
+{
+    @Autowired
+    private SurProjectAttendanceUserMapper attendanceUserMapper;
+
+    /**
+     * 查询考勤人员基本属性
+     *
+     * @param id 考勤人员基本属性主键
+     * @return 考勤人员基本属性
+     */
+    @Override
+    public SurProjectAttendanceUser selectSurProjectAttendanceUserById(Long id)
+    {
+        return attendanceUserMapper.selectSurProjectAttendanceUserById(id);
+    }
+
+    /**
+     * 查询考勤人员信息
+     *
+     * @param quartzProjectAttendanceUser
+     * @return 考勤人员基本属性
+     */
+    @Override
+    public SurProjectAttendanceUser findCurrentAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser) {
+        return attendanceUserMapper.findCurrentAttendanceUser(quartzProjectAttendanceUser);
+    }
+
+    /**
+     * 查询[研筑]考勤人员信息
+     *
+     * @param quartzProjectAttendanceUser
+     * @return 考勤人员基本属性
+     */
+    public SurProjectAttendanceUser findYzCurrentAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser){
+        return attendanceUserMapper.findYzCurrentAttendanceUser(quartzProjectAttendanceUser);
+    }
+
+    /**
+     * 查询考勤人员基本属性列表
+     *
+     * @param quartzProjectAttendanceUser 考勤人员基本属性
+     * @return 考勤人员基本属性
+     */
+    @Override
+    public List<SurProjectAttendanceUser> selectSurProjectAttendanceUserList(SurProjectAttendanceUser quartzProjectAttendanceUser)
+    {
+        return attendanceUserMapper.selectSurProjectAttendanceUserList(quartzProjectAttendanceUser);
+    }
+
+    /**
+     * 新增考勤人员基本属性
+     *
+     * @param quartzProjectAttendanceUser 考勤人员基本属性
+     * @return 结果
+     */
+    @Override
+    public int insertSurProjectAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser)
+    {
+        if(StringUtils.isEmpty(quartzProjectAttendanceUser.getCreateBy())){
+            quartzProjectAttendanceUser.setCreateBy("task");
+            quartzProjectAttendanceUser.setCreateTime(DateUtils.getNowDate());
+        }
+        return attendanceUserMapper.insertSurProjectAttendanceUser(quartzProjectAttendanceUser);
+    }
+
+    /**
+     * 修改考勤人员基本属性
+     *
+     * @param quartzProjectAttendanceUser 考勤人员基本属性
+     * @return 结果
+     */
+    @Override
+    public int updateSurProjectAttendanceUser(SurProjectAttendanceUser quartzProjectAttendanceUser)
+    {
+        if(StringUtils.isEmpty(quartzProjectAttendanceUser.getCreateBy())){
+            quartzProjectAttendanceUser.setUpdateBy("task");
+        }
+        quartzProjectAttendanceUser.setUpdateTime(DateUtils.getNowDate());
+        return attendanceUserMapper.updateSurProjectAttendanceUser(quartzProjectAttendanceUser);
+    }
+
+    /**
+     * 批量删除考勤人员基本属性
+     *
+     * @param ids 需要删除的考勤人员基本属性主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceUserByIds(Long[] ids)
+    {
+        return attendanceUserMapper.deleteSurProjectAttendanceUserByIds(ids);
+    }
+
+    /**
+     * 删除考勤人员基本属性信息
+     *
+     * @param id 考勤人员基本属性主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceUserById(Long id)
+    {
+        return attendanceUserMapper.deleteSurProjectAttendanceUserById(id);
+    }
+
+    /**
+     * 批量删除考勤人员基本属性
+     *
+     * @param list 需要删除的数据参数集合
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectAttendanceUserByParams(List<String> list) {
+        return attendanceUserMapper.deleteSurProjectAttendanceUserByParams(list);
+    }
+
+    /**
+     * 批量新增考勤人员基本属性
+     *
+     * @param quartzProjectAttendanceUserList 考勤人员基本属性列表
+     * @return 结果
+     */
+    @Override
+    public int batchSurProjectAttendanceUser(List<SurProjectAttendanceUser> quartzProjectAttendanceUserList) {
+        return attendanceUserMapper.batchSurProjectAttendanceUser(quartzProjectAttendanceUserList);
+    }
+
+    @Override
+    public void add(SurProjectAttendanceUser user) {
+        SurProjectAttendanceUser where=new SurProjectAttendanceUser();
+        where.setWorkerId(user.getWorkerId());
+        where.setCfgid(user.getCfgid());
+        List<SurProjectAttendanceUser> list=selectSurProjectAttendanceUserList(where);
+        if(list.size()==0){
+            insertSurProjectAttendanceUser(user);
+        }else{
+            SurProjectAttendanceUser old=list.get(0);
+            if(user.getVendorsCode().equals("jgw")){
+                user.setCompanyId(old.getCompanyId());
+                String oldNav=old.getNativePlace();
+                String newNav=user.getNativePlace();
+                if(oldNav==null || !oldNav.equals(newNav)){
+                    old.setNativePlace(newNav);
+                }
+            }
+            user.setId(old.getId());
+            updateSurProjectAttendanceUser(user);
+        }
+    }
+
+    @Override
+    public List<SurProjectAttendanceUser> queryAttendanceData(SurProjectAttendanceUser where) {
+        List<SurProjectAttendanceUser> list= attendanceUserMapper.queryAttendanceUsers(where);
+        List<String> workerIds=new ArrayList<>();
+        for(SurProjectAttendanceUser u: list){
+            workerIds.add(u.getWorkerId());
+        }
+        where.setWorkerIds(workerIds);
+        List<SurProjectAttendanceUser> datas= attendanceUserMapper.todayAttendanceData(workerIds);
+        for (SurProjectAttendanceUser u:list) {
+            u.setInTime(findDate(datas,u,"E"));
+            u.setOutTime(findDate(datas,u,"L"));
+        }
+        return list;
+    }
+
+    @Override
+    public long countTodayAttendance(SurProjectAttendanceUser where) {
+        return attendanceUserMapper.countTodayAttendance(where);
+    }
+
+    @Override
+    public List<SurProjectAttendanceUser> todayAttendance(SurProjectAttendanceUser where) {
+        if(where.getIndex()<1){
+            where.setIndex(1);
+        }
+        where.setIndex((where.getIndex()-1)* where.getSize());
+        List<SurProjectAttendanceUser> list= attendanceUserMapper.todayAttendance(where);
+        List<String> workerIds=new ArrayList<>();
+        for(SurProjectAttendanceUser u: list){
+            workerIds.add(u.getWorkerId());
+        }
+        List<SurProjectAttendanceUser> datas= attendanceUserMapper.todayAttendanceData(workerIds);
+        for (SurProjectAttendanceUser u:list) {
+            u.setInTime(findDate(datas,u,"E"));
+            u.setOutTime(findDate(datas,u,"L"));
+        }
+        return list;
+    }
+
+    @Override
+    public long countAttendance(SurProjectAttendanceUser user) {
+        SurProjectAttendanceUser where=new SurProjectAttendanceUser();
+        where.setCreateBy(user.getCreateBy());
+        where.setSubDeptId(user.getSubDeptId());
+        where.setProjectId(user.getProjectId());
+        return attendanceUserMapper.countAttendance(where);
+    }
+
+    @Override
+    public List<SurProjectAttendanceUser> selectSurProjectAttendanceUserListJgw(SurProjectAttendanceUser quartzProjectAttendanceUser) {
+        return attendanceUserMapper.selectSurProjectAttendanceUserListJgw(quartzProjectAttendanceUser);
+    }
+
+    /**
+     * 在岗工人查询
+     * @param where
+     * @return
+     */
+    @Override
+    public List<SurProjectAttendanceUser> queryWorkerOnDuty(SurProjectAttendanceUser where) {
+        return attendanceUserMapper.queryWorkerOnDuty(where);
+    }
+
+    /**
+     * 统计人员数据
+     * @param where
+     * @return
+     */
+    public List<Map<String, Object>> groupUserByParams(SurProjectAttendanceUser where){
+        return attendanceUserMapper.groupUserByParams(where);
+    }
+
+    /**
+     * 在岗工人查询
+     * @param where
+     * @return
+     */
+    @Override
+    public List<SurProjectAttendanceUser> attendanceUserList(SurProjectAttendanceUser where){
+        return attendanceUserMapper.attendanceUserList(where);
+    }
+
+    /**
+     * 统计人员数据
+     * @param projectId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> findUserAllByDays(Long projectId){
+        return attendanceUserMapper.findUserAllByDays(projectId);
+    }
+
+    /**
+     * 按部门汇总在岗人数
+     * @param where
+     * @return
+     */
+    @Override
+    public List<SurProjectAttendanceUser> groupByWorkerOnDutyByDept(SurProjectAttendanceUser where) {
+        return attendanceUserMapper.groupByWorkerOnDutyByDept(where);
+    }
+
+    @Override
+    public List<SurProjectAttendanceUser> querySurProjectAttendanceUserList(SurProjectAttendanceUser quartzProjectAttendanceUser) {
+        return attendanceUserMapper.querySurProjectAttendanceUserList(quartzProjectAttendanceUser);
+    }
+    /**
+     * 按部门汇总在岗|离岗人数
+     * @param where
+     * @return
+     */
+    @Override
+    public List<SurProjectAttendanceUser> groupByWorkerByDept(SurProjectAttendanceUser where) {
+        return attendanceUserMapper.groupByWorkerByDept(where);
+    }
+    /**
+     * 在岗|离岗工人查询
+     * @param where
+     * @return
+     */
+    @Override
+    public List<SurProjectAttendanceUser> queryWorkerByState(SurProjectAttendanceUser where) {
+        return attendanceUserMapper.queryWorkerByState(where);
+    }
+
+    private Date findDate(List<SurProjectAttendanceUser> datas, SurProjectAttendanceUser u, String type) {
+        for (SurProjectAttendanceUser user:datas) {
+            if(user.getWorkerId().equals(u.getWorkerId()) && user.getName().equals(type)){
+                if(type.equals("L")){
+                    return user.getOutTime();
+                }else{
+                    return user.getInTime();
+                }
+            }
+        }
+        return  null;
+    }
+
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/impl/SurProjectServiceImpl.java

@@ -0,0 +1,97 @@
+package com.yanzhu.xd.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.xd.system.mapper.SurProjectMapper;
+import com.yanzhu.xd.system.domain.SurProject;
+import com.yanzhu.xd.system.service.ISurProjectService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 项目Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-10-25
+ */
+@Service
+public class SurProjectServiceImpl implements ISurProjectService 
+{
+    @Autowired
+    private SurProjectMapper surProjectMapper;
+
+    /**
+     * 查询项目
+     * 
+     * @param id 项目ID
+     * @return 项目
+     */
+    @Override
+    public SurProject selectSurProjectById(Long id)
+    {
+        return surProjectMapper.selectSurProjectById(id);
+    }
+
+    /**
+     * 查询项目列表
+     * 
+     * @param surProject 项目
+     * @return 项目
+     */
+    @Override
+    public List<SurProject> selectSurProjectList(SurProject surProject)
+    {
+        return surProjectMapper.selectSurProjectList(surProject);
+    }
+
+    /**
+     * 新增项目
+     * 
+     * @param surProject 项目
+     * @return 结果
+     */
+    @Override
+    public int insertSurProject(SurProject surProject)
+    {
+        surProject.setCreateTime(DateUtils.getNowDate());
+        return surProjectMapper.insertSurProject(surProject);
+    }
+
+    /**
+     * 修改项目
+     * 
+     * @param surProject 项目
+     * @return 结果
+     */
+    @Override
+    public int updateSurProject(SurProject surProject)
+    {
+        surProject.setUpdateTime(DateUtils.getNowDate());
+        return surProjectMapper.updateSurProject(surProject);
+    }
+
+    /**
+     * 删除项目对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectByIds(String ids)
+    {
+        return surProjectMapper.deleteSurProjectByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除项目信息
+     * 
+     * @param id 项目ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectById(Long id)
+    {
+        return surProjectMapper.deleteSurProjectById(id);
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/service/impl/SysNativeServiceImpl.java

@@ -0,0 +1,99 @@
+package com.yanzhu.xd.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.xd.system.mapper.SysNativeMapper;
+import com.yanzhu.xd.system.domain.SysNative;
+import com.yanzhu.xd.system.service.ISysNativeService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 省市县Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-10-26
+ */
+@Service
+public class SysNativeServiceImpl implements ISysNativeService 
+{
+    @Autowired
+    private SysNativeMapper sysNativeMapper;
+
+    /**
+     * 查询省市县
+     * 
+     * @param id 省市县ID
+     * @return 省市县
+     */
+    @Override
+    public SysNative selectSysNativeById(Long id)
+    {
+        return sysNativeMapper.selectSysNativeById(id);
+    }
+
+    /**
+     * 查询省市县列表
+     * 
+     * @param sysNative 省市县
+     * @return 省市县
+     */
+    @Override
+    public List<SysNative> selectSysNativeList(SysNative sysNative)
+    {
+        return sysNativeMapper.selectSysNativeList(sysNative);
+    }
+
+    /**
+     * 新增省市县
+     * 
+     * @param sysNative 省市县
+     * @return 结果
+     */
+    @Override
+    public int insertSysNative(SysNative sysNative)
+    {
+        return sysNativeMapper.insertSysNative(sysNative);
+    }
+
+    /**
+     * 修改省市县
+     * 
+     * @param sysNative 省市县
+     * @return 结果
+     */
+    @Override
+    public int updateSysNative(SysNative sysNative)
+    {
+        return sysNativeMapper.updateSysNative(sysNative);
+    }
+
+    /**
+     * 删除省市县对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysNativeByIds(String ids)
+    {
+        return sysNativeMapper.deleteSysNativeByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除省市县信息
+     * 
+     * @param id 省市县ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysNativeById(Long id)
+    {
+        return sysNativeMapper.deleteSysNativeById(id);
+    }
+
+    @Override
+    public List<SysNative> selectSysNativeListById(long id) {
+        return sysNativeMapper.selectSysNativeListById(id);
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/task/AttendanceTask.java

@@ -0,0 +1,25 @@
+package com.yanzhu.xd.system.task;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import java.io.IOException;
+
+public class AttendanceTask {
+    public static String getResult(Request request) {
+        OkHttpClient client = new OkHttpClient();
+        Response response;
+        try {
+            response = client.newCall(request).execute();
+            if (response.body() != null) {
+                return response.body().string();
+            } else {
+                throw new RuntimeException();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+    }
+}

ruoyi-yanzhu/src/main/java/com/yanzhu/xd/system/utils/SecurityTools.java

@@ -0,0 +1,13 @@
+package com.yanzhu.xd.system.utils;
+
+import com.ruoyi.common.utils.ShiroUtils;
+
+public class SecurityTools {
+    public static String getUsername() {
+        try {
+            return ShiroUtils.getLoginName();
+        } catch (Exception e) {
+            return "task";
+        }
+    }
+}

ruoyi-yanzhu/src/main/resources/mapper/system/DevTowerProjectConfigMapper.xml

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.xd.system.mapper.DevTowerProjectConfigMapper">
+    
+    <resultMap type="DevTowerProjectConfig" id="DevTowerProjectConfigResult">
+        <result property="id"    column="id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="projectName"    />
+        <result property="deviceSn"    column="device_sn"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceSource"    column="device_source"    />
+        <result property="towerId"    column="tower_id"    />
+        <result property="towerType"    column="tower_type"    />
+        <result property="coordinateX"    column="coordinate_x"    />
+        <result property="coordinateY"    column="coordinate_y"    />
+        <result property="frontBrachium"    column="front_brachium"    />
+        <result property="afterBrachium"    column="after_brachium"    />
+        <result property="towerBodyHeight"    column="tower_body_height"    />
+        <result property="towerCapHeight"    column="tower_cap_height"    />
+        <result property="towerSectionHeight"    column="tower_section_height"    />
+        <result property="online"    column="online"    />
+        <result property="driName"    column="dri_name"    />
+        <result property="driPhone"    column="dri_phone"    />
+        <result property="safName"    column="saf_name"    />
+        <result property="safPhone"    column="saf_phone"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDevTowerProjectConfigVo">
+        select dtpc.id, dtpc.project_id, sp.projectName, dtpc.device_sn, dtpc.device_name, dtpc.device_source, dtpc.tower_id, dtpc.tower_type, dtpc.coordinate_x, dtpc.coordinate_y, dtpc.front_brachium, dtpc.after_brachium, dtpc.tower_body_height, dtpc.tower_cap_height, dtpc.tower_section_height, dtpc.online, dtpc.dri_name, dtpc.dri_phone, dtpc.saf_name, dtpc.saf_phone, dtpc.is_del, dtpc.create_by, dtpc.create_time, dtpc.update_by, dtpc.update_time, dtpc.remark from dev_tower_project_config dtpc
+        left join sur_project sp on sp.id = dtpc.project_id
+    </sql>
+
+    <select id="selectDevTowerProjectConfigList" parameterType="DevTowerProjectConfig" resultMap="DevTowerProjectConfigResult">
+        <include refid="selectDevTowerProjectConfigVo"/>
+        <where>  
+            <if test="projectId != null "> and dtpc.project_id = #{projectId}</if>
+            <if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
+            <if test="deviceSn != null  and deviceSn != ''"> and dtpc.device_sn = #{deviceSn}</if>
+            <if test="deviceName != null  and deviceName != ''"> and dtpc.device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceSource != null  and deviceSource != ''"> and dtpc.device_source = #{deviceSource}</if>
+            <if test="towerId != null  and towerId != ''"> and dtpc.tower_id = #{towerId}</if>
+            <if test="towerType != null  and towerType != ''"> and dtpc.tower_type = #{towerType}</if>
+            <if test="isDel != null "> and dtpc.is_del = #{isDel}</if>
+        </where>
+        order by dtpc.id desc
+    </select>
+    
+    <select id="selectDevTowerProjectConfigById" parameterType="Long" resultMap="DevTowerProjectConfigResult">
+        <include refid="selectDevTowerProjectConfigVo"/>
+        where dtpc.id = #{id}
+    </select>
+
+    <select id="selectDevTowerProjectConfigBySn" parameterType="String" resultMap="DevTowerProjectConfigResult">
+        <include refid="selectDevTowerProjectConfigVo"/>
+        where dtpc.device_sn = #{sn} and dtpc.is_del = '0'
+    </select>
+
+    <insert id="insertDevTowerProjectConfig" parameterType="DevTowerProjectConfig" useGeneratedKeys="true" keyProperty="id">
+        insert into dev_tower_project_config
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deviceSn != null">device_sn,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceSource != null">device_source,</if>
+            <if test="towerType != null">tower_type,</if>
+            <if test="towerId != null">tower_id,</if>
+            <if test="coordinateX != null">coordinate_x,</if>
+            <if test="coordinateY != null">coordinate_y,</if>
+            <if test="frontBrachium != null">front_brachium,</if>
+            <if test="afterBrachium != null">after_brachium,</if>
+            <if test="towerBodyHeight != null">tower_body_height,</if>
+            <if test="towerCapHeight != null">tower_cap_height,</if>
+            <if test="towerSectionHeight != null">tower_section_height,</if>
+            <if test="online != null">online,</if>
+            <if test="driName != null">dri_name,</if>
+            <if test="driPhone != null">dri_phone,</if>
+            <if test="safName != null">saf_name,</if>
+            <if test="safPhone != null">saf_phone,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deviceSn != null">#{deviceSn},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceSource != null">#{deviceSource},</if>
+            <if test="towerType != null">#{towerType},</if>
+            <if test="towerId != null">#{towerId},</if>
+            <if test="coordinateX != null">#{coordinateX},</if>
+            <if test="coordinateY != null">#{coordinateY},</if>
+            <if test="frontBrachium != null">#{frontBrachium},</if>
+            <if test="afterBrachium != null">#{afterBrachium},</if>
+            <if test="towerBodyHeight != null">#{towerBodyHeight},</if>
+            <if test="towerCapHeight != null">#{towerCapHeight},</if>
+            <if test="towerSectionHeight != null">#{towerSectionHeight},</if>
+            <if test="online != null">#{online},</if>
+            <if test="driName != null">#{driName},</if>
+            <if test="driPhone != null">#{driPhone},</if>
+            <if test="safName != null">#{safName},</if>
+            <if test="safPhone != null">#{safPhone},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDevTowerProjectConfig" parameterType="DevTowerProjectConfig">
+        update dev_tower_project_config
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deviceSn != null">device_sn = #{deviceSn},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceSource != null">device_source = #{deviceSource},</if>
+            <if test="towerType != null">tower_type = #{towerType},</if>
+            <if test="towerId != null">tower_id = #{towerId},</if>
+            <if test="coordinateX != null">coordinate_x = #{coordinateX},</if>
+            <if test="coordinateY != null">coordinate_y = #{coordinateY},</if>
+            <if test="frontBrachium != null">front_brachium = #{frontBrachium},</if>
+            <if test="afterBrachium != null">after_brachium = #{afterBrachium},</if>
+            <if test="towerBodyHeight != null">tower_body_height = #{towerBodyHeight},</if>
+            <if test="towerCapHeight != null">tower_cap_height = #{towerCapHeight},</if>
+            <if test="towerSectionHeight != null">tower_section_height = #{towerSectionHeight},</if>
+            <if test="online != null">online = #{online},</if>
+            <if test="driName != null">dri_name = #{driName},</if>
+            <if test="driPhone != null">dri_phone = #{driPhone},</if>
+            <if test="safName != null">saf_name = #{safName},</if>
+            <if test="safPhone != null">saf_phone = #{safPhone},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteDevTowerProjectConfigById" parameterType="Long">
+        update dev_tower_project_config set is_del=1 where id = #{id}
+    </update>
+
+    <update id="deleteDevTowerProjectConfigByIds" parameterType="String">
+        update dev_tower_project_config set is_del=1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <select id="findtowerConfigGroupOnline" parameterType="DevTowerProjectConfig" resultType="Map">
+        select online, count(1) as total from dev_tower_project_config
+        <where>
+            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+        </where>
+        group by online
+    </select>
+
+</mapper>

ruoyi-yanzhu/src/main/resources/mapper/system/SurProjectAttendanceCfgMapper.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.xd.system.mapper.SurProjectAttendanceCfgMapper">
+    
+    <resultMap type="SurProjectAttendanceCfg" id="SurProjectAttendanceCfgResult">
+        <result property="id"    column="id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="subDeptId"    column="sub_dept_id"    />
+        <result property="vendorsCode"    column="vendors_code"    />
+        <result property="vendorsParameter"    column="vendors_parameter"    />
+        <result property="enabled"    column="enabled"    />
+        <result property="state"    column="state"    />
+        <result property="remark"    column="remark"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="projectName" column="projectName"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="unitName" column="unitName"/>
+        <result property="vendorName" column="vendorName"/>
+    </resultMap>
+
+    <sql id="selectSurProjectAttendanceCfgVo">
+        select *
+        from (
+                 SELECT a.*,sp.projectName,pu.unitName,sdd1.dict_label vendorName FROM sur_project_attendance_cfg  a
+                                                                                           LEFT JOIN sur_project sp ON a.project_id = sp.id
+                                                                                           LEFT JOIN sur_project_unit_info pu ON a.sub_dept_id=pu.unitId AND a.project_id=pu.projectId
+                                                                                           LEFT JOIN sys_dict_data sdd1 ON sdd1.dict_type = 'attendance_vendors' AND sdd1.dict_value = a.vendors_code
+             )  sur_project_attendance_cfg
+    </sql>
+
+    <select id="selectSurProjectAttendanceCfgList" parameterType="SurProjectAttendanceCfg" resultMap="SurProjectAttendanceCfgResult">
+        <include refid="selectSurProjectAttendanceCfgVo"/>
+        <where>
+            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="subDeptId != null "> and sub_dept_id = #{subDeptId}</if>
+            <if test="vendorsCode != null  and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if>
+            <if test="vendorsParameter != null  and vendorsParameter != ''"> and vendors_parameter = #{vendorsParameter}</if>
+            <if test="enabled != null "> and enabled = #{enabled}</if>
+            <if test="state != null "> and state = #{state}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+        </where>
+    </select>
+
+
+    <select id="selectSurProjectAttendanceCfgListForAllInfo" parameterType="SurProjectAttendanceCfg" resultMap="SurProjectAttendanceCfgResult">
+        SELECT a.*,b.projectName,c.`unitName` dept_name
+        FROM sur_project_attendance_cfg a,sur_project b,sur_project_unit_info c WHERE a.project_id=b.id AND c.`unitId`=b.`deptId`
+        <if test="id != null "> and a.id = #{id}</if>
+    </select>
+
+    <select id="selectSurProjectAttendanceCfgById" parameterType="Long" resultMap="SurProjectAttendanceCfgResult">
+        <include refid="selectSurProjectAttendanceCfgVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSurProjectAttendanceCfg" parameterType="SurProjectAttendanceCfg" useGeneratedKeys="true" keyProperty="id">
+        insert into sur_project_attendance_cfg
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="subDeptId != null">sub_dept_id,</if>
+            <if test="vendorsCode != null">vendors_code,</if>
+            <if test="vendorsParameter != null">vendors_parameter,</if>
+            <if test="enabled != null">enabled,</if>
+            <if test="state != null">state,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="subDeptId != null">#{subDeptId},</if>
+            <if test="vendorsCode != null">#{vendorsCode},</if>
+            <if test="vendorsParameter != null">#{vendorsParameter},</if>
+            <if test="enabled != null">#{enabled},</if>
+            <if test="state != null">#{state},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSurProjectAttendanceCfg" parameterType="SurProjectAttendanceCfg">
+        update sur_project_attendance_cfg
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="subDeptId != null">sub_dept_id = #{subDeptId},</if>
+            <if test="vendorsCode != null">vendors_code = #{vendorsCode},</if>
+            <if test="vendorsParameter != null">vendors_parameter = #{vendorsParameter},</if>
+            <if test="enabled != null">enabled = #{enabled},</if>
+            <if test="state != null">state = #{state},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSurProjectAttendanceCfgById" parameterType="Long">
+        delete from sur_project_attendance_cfg where id = #{id}
+    </delete>
+
+    <delete id="deleteSurProjectAttendanceCfgByIds" parameterType="String">
+        delete from sur_project_attendance_cfg where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-yanzhu/src/main/resources/mapper/system/SurProjectAttendanceDataMapper.xml

@@ -0,0 +1,571 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.xd.system.mapper.SurProjectAttendanceDataMapper">
+    
+    <resultMap type="SurProjectAttendanceData" id="SurProjectAttendanceDataResult">
+        <result property="id"    column="id"    />
+        <result property="cfgid"    column="cfgid"    />
+        <result property="appId"    column="app_id"    />
+        <result property="projectId"    column="projectId"    />
+        <result property="projectName"    column="projectName"    />
+        <result property="deptId"    column="deptId"    />
+        <result property="deptName"    column="deptName"    />
+        <result property="vendorsCode"    column="vendors_code"    />
+        <result property="serverid"    column="serverid"    />
+        <result property="workerId"    column="workerId"    />
+        <result property="workerName"    column="workerName"    />
+        <result property="identification"    column="identification"    />
+        <result property="workerPhoto"    column="workerPhoto"    />
+        <result property="workerGender"    column="workerGender"    />
+        <result property="birthDate"    column="birthDate"    />
+        <result property="ethnic"    column="ethnic"    />
+        <result property="nativePlace"    column="nativePlace"    />
+        <result property="phone"    column="phone"    />
+        <result property="workTypeName"    column="workTypeName"    />
+        <result property="specWorkType"    column="specWorkType"    />
+        <result property="groupName"    column="groupName"    />
+        <result property="companyTypeId"    column="companyTypeId"    />
+        <result property="companyName"    column="companyName"    />
+        <result property="attendanceTime"    column="attendance_time"    />
+        <result property="attendanceOutTime"    column="attendance_out_time"    />
+        <result property="scanPhoto"    column="scanPhoto"    />
+        <result property="teamId"    column="teamId"    />
+        <result property="workTypeCode"    column="workTypeCode"    />
+        <result property="companyId"    column="companyId"    />
+        <result property="vendorId"    column="vendorId"    />
+        <result property="deviceCode"    column="device_code"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSurProjectAttendanceDataVo">
+        select
+            id,
+            cfgid,
+            app_id,
+            projectId,
+            projectName,
+            deptId,
+            deptName,
+            vendors_code,
+            serverid,
+            workerId,
+            workerName,
+            identification,
+            workerPhoto,
+            workerGender,
+            birthDate,
+            ethnic,
+            nativePlace,
+            phone,
+            workTypeName,
+            specWorkType,
+            groupName,
+            companyTypeId,
+            companyName,
+            attendance_time,
+            attendance_out_time,
+            scanPhoto,
+            teamId,
+            workTypeCode,
+            companyId,
+            vendorId,
+            device_code,
+            is_del,
+            create_by,
+            create_time,
+            update_by,
+            update_time,
+            remark
+        from sur_project_attendance_data_${year}
+    </sql>
+    <select id="findCurrentAttendanceData" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
+        select * from sur_project_attendance_data_${year}
+        <where>
+            <if test="cfgid != null "> and cfgid = #{cfgid}</if>
+            <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="workerId != null and workerId != ''"> and workerId = #{workerId}</if>
+            <if test="attendanceTime != null and attendanceTime != ''"> and date(attendance_time) = date(#{attendanceTime})</if>
+        </where>
+        order by id desc LIMIT 1
+    </select>
+    <select id="selectSurProjectAttendanceDataListEx" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
+        select * from sur_project_attendance_data_${year}
+        <where>
+            <if test="cfgid != null "> and cfgid = #{cfgid}</if>
+            <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="projectId != null "> and projectId = #{projectId}</if>
+            <if test="deptId != null "> and deptId = #{deptId}</if>
+            <if test="vendorsCode != null  and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if>
+            <if test="serverid != null "> and serverid = #{serverid}</if>
+            <if test="workerId != null "> and workerId = #{workerId}</if>
+
+            <if test="identification != null  and identification != ''"> and identification = #{identification}</if>
+            <if test="teamId != null "> and teamId = #{teamId}</if>
+            <if test="workTypeCode != null  and workTypeCode != ''"> and workTypeCode = #{workTypeCode}</if>
+            <if test="companyId != null "> and companyId = #{companyId}</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
+            <if test="companyTypeId!=null">
+                <if test="companyTypeId>100">
+                    <if test="companyTypeId==101">
+                        and companyTypeId in (1,6)
+                    </if>
+                    <if test="companyTypeId==102">
+                        and companyTypeId =8
+                    </if>
+                    <if test="companyTypeId==103">
+                        and companyTypeId in (0,2,3,4,5)
+                    </if>
+                </if>
+                <if test="companyTypeId &lt;100">
+                    and companyTypeId=#{companyTypeId}
+                </if>
+            </if>
+            <if test="scanPhoto != null  and scanPhoto != ''"> and scanPhoto = #{scanPhoto}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="attendanceTime != null  and attendanceTime != ''"> and date(attendance_time) = date(#{attendanceTime})</if>
+        </where>
+        order by id desc
+    </select>
+    <select id="selectSurProjectAttendanceDataList" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
+        <include refid="selectSurProjectAttendanceDataVo"/>
+        <where>
+            <if test="cfgid != null "> and cfgid = #{cfgid}</if>
+            <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="projectId != null ">and cfgid in (select id from sur_project_attendance_cfg where projectId =  #{projectId})</if>
+            <if test="deptId != null "> and deptId = #{deptId}</if>
+            <if test="vendorsCode != null  and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if>
+            <if test="serverid != null "> and serverid = #{serverid}</if>
+            <if test="workerId != null "> and workerId = #{workerId}</if>
+            <if test="attendanceOutTime!=null and  attendanceOutTime!=''">
+                and  date(attendance_out_time) &lt;=date(#{attendanceOutTime})
+            </if>
+
+            <if test="teamId != null "> and teamId = #{teamId}</if>
+            <if test="workTypeCode != null  and workTypeCode != ''"> and workTypeCode = #{workTypeCode}</if>
+            <if test="companyId != null "> and companyId = #{companyId}</if>
+            <if test="companyTypeId!=null">
+                <if test="companyTypeId>100">
+                    <if test="companyTypeId==101">
+                        and companyTypeId in (1,6)
+                    </if>
+                    <if test="companyTypeId==102">
+                        and companyTypeId =8
+                    </if>
+                    <if test="companyTypeId==103">
+                        and companyTypeId in (0,2,3,4,5)
+                    </if>
+                </if>
+                <if test="companyTypeId &lt;100">
+                    and companyTypeId=#{companyTypeId}
+                </if>
+            </if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
+            <if test="scanPhoto != null  and scanPhoto != ''"> and scanPhoto like concat('%', #{scanPhoto}, '%')</if>
+            <if test="workerName != null  and workerName != ''"> and workerName like concat('%', #{workerName}, '%')</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="attendanceTime != null  and attendanceTime != ''"> and date(attendance_time) &gt;= date(#{attendanceTime})</if>
+            <if test="identification != null  and identification != ''"> and identification = #{identification}</if>
+        </where>
+        order by id desc
+    </select>
+    <select id="selectSurProjectAttendanceDataById" parameterType="Long" resultMap="SurProjectAttendanceDataResult">
+        <include refid="selectSurProjectAttendanceDataVo"/>
+        where id = #{id}
+    </select>
+
+
+    <insert id="insertSurProjectAttendanceData" parameterType="SurProjectAttendanceData" useGeneratedKeys="true" keyProperty="id">
+        insert into sur_project_attendance_data_${year}
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cfgid != null">cfgid,</if>
+            <if test="appId != null">app_id,</if>
+            <if test="projectId != null">projectId,</if>
+            <if test="projectName != null">projectName,</if>
+            <if test="deptId != null">deptId,</if>
+            <if test="deptName != null">deptName,</if>
+            <if test="vendorsCode != null">vendors_code,</if>
+            <if test="serverid != null">serverid,</if>
+            <if test="workerId != null">workerId,</if>
+            <if test="workerName != null">workerName,</if>
+            <if test="identification != null">identification,</if>
+            <if test="workerPhoto != null">workerPhoto,</if>
+            <if test="workerGender != null">workerGender,</if>
+            <if test="birthDate != null">birthDate,</if>
+            <if test="ethnic != null">ethnic,</if>
+            <if test="nativePlace != null">nativePlace,</if>
+            <if test="phone != null">phone,</if>
+            <if test="workTypeName != null">workTypeName,</if>
+            <if test="specWorkType != null">specWorkType,</if>
+            <if test="groupName != null">groupName,</if>
+            <if test="companyTypeId != null">companyTypeId,</if>
+            <if test="companyName != null">companyName,</if>
+            <if test="attendanceTime != null">attendance_time,</if>
+            <if test="attendanceOutTime != null">attendance_out_time,</if>
+            <if test="scanPhoto != null">scanPhoto,</if>
+            <if test="teamId != null">teamId,</if>
+            <if test="workTypeCode != null">workTypeCode,</if>
+            <if test="companyId != null">companyId,</if>
+            <if test="vendorId != null">vendorId,</if>
+            <if test="deviceCode != null">device_code,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cfgid != null">#{cfgid},</if>
+            <if test="appId != null">#{appId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="projectName != null">#{projectName},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="vendorsCode != null">#{vendorsCode},</if>
+            <if test="serverid != null">#{serverid},</if>
+            <if test="workerId != null">#{workerId},</if>
+            <if test="workerName != null">#{workerName},</if>
+            <if test="identification != null">#{identification},</if>
+            <if test="workerPhoto != null">#{workerPhoto},</if>
+            <if test="workerGender != null">#{workerGender},</if>
+            <if test="birthDate != null">#{birthDate},</if>
+            <if test="ethnic != null">#{ethnic},</if>
+            <if test="nativePlace != null">#{nativePlace},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="workTypeName != null">#{workTypeName},</if>
+            <if test="specWorkType != null">#{specWorkType},</if>
+            <if test="groupName != null">#{groupName},</if>
+            <if test="companyTypeId != null">#{companyTypeId},</if>
+            <if test="companyName != null">#{companyName},</if>
+            <if test="attendanceTime != null">#{attendanceTime},</if>
+            <if test="attendanceOutTime != null">#{attendanceOutTime},</if>
+            <if test="scanPhoto != null">#{scanPhoto},</if>
+            <if test="teamId != null">#{teamId},</if>
+            <if test="workTypeCode != null">#{workTypeCode},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="vendorId != null">#{vendorId},</if>
+            <if test="deviceCode != null">#{deviceCode},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSurProjectAttendanceData" parameterType="SurProjectAttendanceData">
+        update sur_project_attendance_data_${year}
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cfgid != null">cfgid = #{cfgid},</if>
+            <if test="appId != null">app_id = #{appId},</if>
+            <if test="projectId != null">projectId = #{projectId},</if>
+            <if test="projectName != null">projectName = #{projectName},</if>
+            <if test="deptId != null">deptId = #{deptId},</if>
+            <if test="deptName != null">deptName = #{deptName},</if>
+            <if test="vendorsCode != null">vendors_code = #{vendorsCode},</if>
+            <if test="serverid != null">serverid = #{serverid},</if>
+            <if test="workerId != null">workerId = #{workerId},</if>
+            <if test="workerName != null">workerName = #{workerName},</if>
+            <if test="identification != null">identification = #{identification},</if>
+            <if test="workerPhoto != null">workerPhoto = #{workerPhoto},</if>
+            <if test="workerGender != null">workerGender = #{workerGender},</if>
+            <if test="birthDate != null">birthDate = #{birthDate},</if>
+            <if test="ethnic != null">ethnic = #{ethnic},</if>
+            <if test="nativePlace != null">nativePlace = #{nativePlace},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="workTypeName != null">workTypeName = #{workTypeName},</if>
+            <if test="specWorkType != null">specWorkType = #{specWorkType},</if>
+            <if test="groupName != null">groupName = #{groupName},</if>
+            <if test="companyTypeId != null">companyTypeId = #{companyTypeId},</if>
+            <if test="companyName != null">companyName = #{companyName},</if>
+            <if test="attendanceTime != null">attendance_time = #{attendanceTime},</if>
+            <if test="attendanceOutTime != null">attendance_out_time = #{attendanceOutTime},</if>
+            <if test="scanPhoto != null">scanPhoto = #{scanPhoto},</if>
+            <if test="teamId != null">teamId = #{teamId},</if>
+            <if test="workTypeCode != null">workTypeCode = #{workTypeCode},</if>
+            <if test="companyId != null">companyId = #{companyId},</if>
+            <if test="vendorId != null">vendorId = #{vendorId},</if>
+            <if test="deviceCode != null">device_code = #{deviceCode},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSurProjectAttendanceDataById" parameterType="Long">
+        delete from sur_project_attendance_data_${year} where id = #{id}
+    </delete>
+
+    <delete id="deleteSurProjectAttendanceDataByIds" parameterType="String">
+        delete from sur_project_attendance_data_${year} where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSurProjectAttendanceDataByParams" parameterType="String">
+        delete from sur_project_attendance_data_${year} where CONCAT(app_id,'-',serverid,'-',workerId) in
+        <foreach collection="list" item="item" separator=","  open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <insert id="batchSurProjectAttendanceData">
+        insert into sur_project_attendance_data_${year}( id, cfgid, app_id, projectId, projectName, deptId, deptName, vendors_code, serverid, workerId, workerName, identification, workerPhoto, workerGender, birthDate, ethnic, nativePlace, phone, workTypeName, specWorkType, groupName, companyTypeId,
+        companyName, attendance_time, attendance_out_time, scanPhoto, teamId,workTypeCode, companyId, vendorId, device_code, is_del, create_by, create_time, update_by, update_time) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.cfgid},#{item.appId}, #{item.projectId}, #{item.projectName}, #{item.deptId}, #{item.deptName}, #{item.vendorsCode}, #{item.serverid}, #{item.workerId}, #{item.workerName}, #{item.identification},#{item.workerPhoto}, #{item.workerGender}, #{item.birthDate},#{item.ethnic}, #{item.nativePlace}, #{item.phone}, #{item.workTypeName}, #{item.specWorkType}, #{item.groupName}, #{item.companyTypeId},
+            #{item.companyName}, #{item.attendanceTime}, #{item.attendanceOutTime}, #{item.scanPhoto},#{item.teamId}, #{item.workTypeCode}, #{item.companyId}, #{item.vendorId}, #{item.deviceCode},#{item.isDel}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <select id="getLastServerId" parameterType="SurProjectAttendanceData" resultType="Long">
+        SELECT IF(MAX(serverid+0),MAX(serverid+0),0) serverid FROM sur_project_attendance_data_${year} WHERE cfgid=#{cfgid}
+    </select>
+
+    <select id="groupByComanyOld"  parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
+        select companyTypeId,count(1) id from ( <include refid="selectSurProjectAttendanceDataVo"/> ) x2 where id in (
+        select min(id) from ( <include refid="selectSurProjectAttendanceDataVo"/> ) x1
+        where  date(attendance_time)=#{attendanceTime}
+        <if test="subDeptId!=null and subDeptId>0"> and project_id in (
+            SELECT id FROM sur_project WHERE isdel=0 AND deptid = #{subDeptId}
+            )
+        </if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="projectId!=null and projectId>0"> and project_id=#{projectId}</if>
+        group by workerId )
+        and  companyTypeId in (1,2,3,4,5,6,8) group by companyTypeId
+    </select>
+    <select id="groupByComany"  parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
+        select g.companyTypeId,count(1) id from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g
+        where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
+        and u.workerid in(
+        SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE()
+        and cfgid in (select id from sur_project_attendance_cfg
+        <where>
+            <if test="projectId!=null and projectId>0">
+                and project_id=#{projectId}
+            </if>
+            <if test="subDeptId!=null and subDeptId>0">
+                and  project_id in (SELECT id FROM sur_project WHERE deptid=#{subDeptId})
+            </if>
+            <if test="prjIds !=null and prjIds.size()>0">
+                and project_id in
+                <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        )
+        )
+        and g.companyTypeId in (1,2,3,4,5,6,8)
+
+        <if test="projectId!=null and projectId>0">
+            and c.project_id=#{projectId}
+        </if>
+        <if test="subDeptId!=null and subDeptId>0">
+            and  c.project_id in (SELECT id FROM sur_project WHERE deptid=#{subDeptId})
+        </if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and c.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by g.companyTypeId
+    </select>
+
+    <select id="groupAllByComany"  parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
+        select g.companyTypeId,count(1) id
+        from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g,
+        sur_project sp
+        where u.cfgid=c.id and u.companyId=g.companyId and u.state=#{id} and c.project_id = sp.id
+        and sp.isDel=0
+        and g.companyTypeId in (0,1,2,3,4,5,6,8)
+        <if test="projectId!=null and projectId>0">
+            and c.project_id=#{projectId}
+        </if>
+        <if test="subDeptId!=null and subDeptId>0">
+            and sp.deptId=#{subDeptId}
+        </if>
+        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and c.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by g.companyTypeId
+    </select>
+
+    <select id="getHuazhuPage" parameterType="SurProjectAttendanceData"  resultType="Long">
+        select max(vendorId) vendorId from sur_project_attendance_data_${year} WHERE cfgid=#{id}
+    </select>
+
+    <select id="initOtherData" parameterType="map" resultType="map">
+        select d.workerId,d.app_id,d.serverid,u.companyId,u.companyName,u.`name`,d.identification,u.recentPhoto,u.gender,u.birthDate,u.ethnic,u.nativePlace,u.phone,
+               u.workTypeName,u.specWorkType,u.groupName,g.companyTypeId,d.teamId,u.workTypeCode,d.vendorId,d.device_code,d.scanPhoto,d.is_del
+        from sur_project_attendance_data d
+                 left JOIN sur_project_attendance_user u on d.workerId = u.workerId and d.cfgid = u.cfgid
+                 left join sur_project_attendance_group g on u.companyId = g.companyId and g.cfgid = u.cfgid
+        where d.cfgid=#{cfgid} and date(d.attendance_time) = #{date}
+        GROUP BY d.workerId
+    </select>
+
+    <select id="initHuaZhuData" parameterType="map" resultType="map">
+        select d.workerId,d.app_id,d.serverid,u.companyId,u.companyName,u.`name`,d.identification,u.recentPhoto,u.gender,u.birthDate,u.ethnic,u.nativePlace,u.phone,
+               u.workTypeName,u.specWorkType,u.groupName,d.teamId,u.workTypeCode,d.vendorId,d.device_code,d.scanPhoto,d.is_del,
+               CASE WHEN sd.type_flag = 2 THEN '1' WHEN sd.type_flag = 3 THEN '2' WHEN sd.type_flag = 4 THEN '8' else '0' end as companyTypeId
+        from sur_project_attendance_data d
+                 left JOIN sur_project_attendance_user u on d.workerId = u.workerId and d.cfgid = u.cfgid
+                 left join sys_dept sd on u.companyName = sd.dept_name
+        where d.cfgid=#{cfgid} and date(d.attendance_time) = #{date}
+        GROUP BY d.workerId
+    </select>
+
+    <select id="findHuaZhuCompanyType" parameterType="string" resultType="string">
+        select CASE WHEN sd.type_flag = 2 THEN '1' WHEN sd.type_flag = 3 THEN '2' WHEN sd.type_flag = 4 THEN '8' else '0' end as companyTypeId
+        from sys_dept sd
+        where sd.dept_name = #{deptName}
+    </select>
+
+    <select id="todayAttendance" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
+        select ady.* from sur_project_attendance_data_${year} ady
+        left join sur_project sp on sp.id = ady.projectId
+        where sp.isDel=0
+        <if test="projectId!=null and projectId>0">
+            and ady.projectId=#{projectId}
+        </if>
+        <if test="id==1">
+            and ady.companyTypeId in (1,6)
+        </if>
+        <if test="id==2">
+            and ady.companyTypeId in (0,2,3,4,5)
+        </if>
+        <if test="id==8">
+            and ady.companyTypeId =8
+        </if>
+        <if test="deptId!=null and deptId>0">
+            and sp.deptId=#{deptId}
+        </if>
+        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and ady.projectId in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="attendanceTime != null  and attendanceTime != ''"> and date(ady.attendance_time) =date(#{attendanceTime})</if>
+    </select>
+
+    <select id="attendanceDataList" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
+        select ady.* from sur_project_attendance_data_${year} ady
+        where ady.cfgid in (select cfg.id from sur_project_attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
+        <if test="companyTypeId==101">
+            and ady.companyTypeId in (1,6)
+        </if>
+        <if test="companyTypeId==103">
+            and ady.companyTypeId in (0,2,3,4,5)
+        </if>
+        <if test="companyTypeId==102">
+            and ady.companyTypeId =8
+        </if>
+        <if test="workerId != null  and workerId != ''"> and ady.workerId = #{workerId}</if>
+        <if test="workerName != null  and workerName != ''"> and ady.workerName like concat('%', #{workerName}, '%')</if>
+        <if test="attendanceTime != null  and attendanceTime != ''"> and date(ady.attendance_time) = date(#{attendanceTime})</if>
+        and ady.is_del=0
+        order by ady.id desc
+    </select>
+
+    <select id="groupTodayCompanyTypeId" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
+        select ady.companyTypeId,count(1) id from sur_project_attendance_data_${year} ady
+        where ady.cfgid in (select id from sur_project_attendance_cfg where
+        is_del=0
+        <if test="projectId!=null and projectId>0">
+            and projectId=#{projectId}
+        </if>
+        and projectId in (select id from sur_project sp where sp.isDel=0
+
+        <if test="deptId!=null and deptId>0">
+            and sp.deptId=#{deptId}
+        </if>
+        <if test="attendanceTime != null  and attendanceTime != ''"> and date(ady.attendance_time) =date(#{attendanceTime})</if>
+
+        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and ady.projectId in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        )
+        )
+
+
+        group by ady.companyTypeId
+    </select>
+
+    <select id="findGroupAllByParams"  parameterType="SurProjectAttendanceData" resultType="Map">
+        select '1' as type,g.companyTypeId,count(1) as total
+        from sur_project_attendance_user u
+                 left join view_sur_project_attendance_group g on g.cfgid = u.cfgid and u.companyId=g.companyId
+        where u.cfgid in (select cfg.id from sur_project_attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
+          and g.companyTypeId in (0,1,2,3,4,5,6,8)
+          and u.state=0
+        group by g.companyTypeId
+        UNION ALL
+        select '2' as type,g.companyTypeId,count(1) as total
+        from sur_project_attendance_user u
+                 left join view_sur_project_attendance_group g on g.cfgid = u.cfgid and u.companyId=g.companyId
+        where u.cfgid in (select cfg.id from sur_project_attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
+          and g.companyTypeId in (0,1,2,3,4,5,6,8)
+          and u.state=1
+        group by g.companyTypeId
+        UNION ALL
+        select '3' as type, d.companyTypeId,count(1) as total from sur_project_attendance_data_${year} d
+        where d.cfgid in (select cfg.id from sur_project_attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
+          and d.is_del=0
+          and date(d.attendance_time) = date(now())
+        group by d.companyTypeId
+    </select>
+
+    <select id="groupDataByParams"  parameterType="SurProjectAttendanceData" resultType="Map">
+        select d.companyTypeId,count(1) as total from sur_project_attendance_data_${year} d
+        where d.cfgid in (select cfg.id from sur_project_attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
+        and d.is_del=0
+        <if test="attendanceTime != null  and attendanceTime != ''"> and date(d.attendance_time) = date(#{attendanceTime})</if>
+        <if test="workerName != null  and workerName != ''"> and d.workerName like concat('%', #{workerName}, '%')</if>
+        group by d.companyTypeId
+    </select>
+
+    <select id="findGroupAllByDays"  parameterType="SurProjectAttendanceData" resultType="Map">
+        select '3' as type, DATE_FORMAT(days.attendanceTime, '%m-%d') as attendanceTime,days.total from(
+                                                                                                           select date(d.attendance_time) as attendanceTime, DATE_FORMAT(d.attendance_time, '%m-%d'),count(1) as total from sur_project_attendance_data_${year} d
+        where d.cfgid in (select cfg.id from sur_project_attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
+          and d.is_del=0
+          and date(d.attendance_time) between #{attendanceTime} and #{attendanceOutTime}
+        group by date(d.attendance_time)
+        order by date(d.attendance_time)
+            )days
+    </select>
+
+</mapper>

ruoyi-yanzhu/src/main/resources/mapper/system/SurProjectAttendanceGroupMapper.xml

@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.xd.system.mapper.SurProjectAttendanceGroupMapper">
+    
+    <resultMap type="SurProjectAttendanceGroup" id="SurProjectAttendanceGroupResult">
+        <result property="id"    column="id"    />
+        <result property="cfgid"    column="cfgid"    />
+        <result property="appId"    column="app_id"    />
+        <result property="serverid"    column="serverid"    />
+        <result property="bizLicense"    column="bizLicense"    />
+        <result property="companyCode"    column="companyCode"    />
+        <result property="companyId"    column="companyId"    />
+        <result property="companyName"    column="companyName"    />
+        <result property="companyTypeId"    column="companyTypeId"    />
+        <result property="vendorId"    column="vendorId"    />
+        <result property="name"    column="name"    />
+        <result property="leaderName"    column="leaderName"    />
+        <result property="leaderPhone"    column="leaderPhone"    />
+        <result property="teamId"    column="teamId"    />
+        <result property="teamName"    column="teamName"    />
+        <result property="type"    column="type"    />
+        <result property="leaderId"    column="leaderId"    />
+        <result property="deleted"    column="deleted"    />
+        <result property="createTimestamp"    column="createTimestamp"    />
+        <result property="platformGroupId"    column="platformGroupId"    />
+        <result property="platformTeamId"    column="platformTeamId"    />
+        <result property="enterDate"    column="enterDate"    />
+        <result property="exitDate"    column="exitDate"    />
+        <result property="remark"    column="remark"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectSurProjectAttendanceGroupVo">
+        select id, cfgid, app_id, serverid, bizLicense, companyCode, companyId, companyName, companyTypeId, vendorId, name, leaderName, leaderPhone, teamId, teamName, type, leaderId, deleted, createTimestamp, platformGroupId, platformTeamId, enterDate, exitDate, remark, is_del, create_by, create_time, update_by, update_time
+        from view_sur_project_attendance_group
+    </sql>
+
+    <select id="selectSurProjectAttendanceGroupViewList" parameterType="SurProjectAttendanceGroup" resultMap="SurProjectAttendanceGroupResult">
+        <include refid="selectSurProjectAttendanceGroupVo"/>
+        <where>
+            <if test="cfgid != null "> and cfgid = #{cfgid}</if>
+            <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="serverid != null "> and serverid = #{serverid}</if>
+            <if test="bizLicense != null  and bizLicense != ''"> and bizLicense = #{bizLicense}</if>
+            <if test="companyCode != null  and companyCode != ''"> and companyCode = #{companyCode}</if>
+            <if test="companyId != null "> and companyId = #{companyId}</if>
+            <if test="companyName != null  and companyName != ''"> and companyName like concat('%', #{companyName}, '%')</if>
+            <if test="companyTypeId != null  and companyTypeId != ''"> and companyTypeId = #{companyTypeId}</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="leaderName != null  and leaderName != ''"> and leaderName like concat('%', #{leaderName}, '%')</if>
+            <if test="leaderPhone != null  and leaderPhone != ''"> and leaderPhone = #{leaderPhone}</if>
+            <if test="teamId != null "> and teamId = #{teamId}</if>
+            <if test="teamName != null  and teamName != ''"> and teamName like concat('%', #{teamName}, '%')</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="leaderId != null "> and leaderId = #{leaderId}</if>
+            <if test="deleted != null "> and deleted = #{deleted}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="platformGroupId != null "> and platformGroupId = #{platformGroupId}</if>
+            <if test="platformTeamId != null "> and platformTeamId = #{platformTeamId}</if>
+            <if test="enterDate != null "> and enterDate = #{enterDate}</if>
+            <if test="exitDate != null "> and exitDate = #{exitDate}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+        </where>
+    </select>
+
+    <select id="selectSurProjectAttendanceGroupList" parameterType="SurProjectAttendanceGroup" resultMap="SurProjectAttendanceGroupResult">
+        select id, cfgid, app_id, serverid, bizLicense, companyCode, companyId, companyName, companyTypeId, vendorId, name, leaderName, leaderPhone, teamId, teamName, type, leaderId, deleted, createTimestamp, platformGroupId, platformTeamId, enterDate, exitDate, remark, is_del, create_by, create_time, update_by, update_time
+        from sur_project_attendance_group
+        <where>
+            <if test="cfgid != null "> and cfgid = #{cfgid}</if>
+            <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="serverid != null "> and serverid = #{serverid}</if>
+            <if test="bizLicense != null  and bizLicense != ''"> and bizLicense = #{bizLicense}</if>
+            <if test="companyCode != null  and companyCode != ''"> and companyCode = #{companyCode}</if>
+            <if test="companyId != null "> and companyId = #{companyId}</if>
+            <if test="companyName != null  and companyName != ''"> and companyName like concat('%', #{companyName}, '%')</if>
+            <if test="companyTypeId != null  and companyTypeId != ''"> and companyTypeId = #{companyTypeId}</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="leaderName != null  and leaderName != ''"> and leaderName like concat('%', #{leaderName}, '%')</if>
+            <if test="leaderPhone != null  and leaderPhone != ''"> and leaderPhone = #{leaderPhone}</if>
+            <if test="teamId != null "> and teamId = #{teamId}</if>
+            <if test="teamName != null  and teamName != ''"> and teamName like concat('%', #{teamName}, '%')</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="leaderId != null "> and leaderId = #{leaderId}</if>
+            <if test="deleted != null "> and deleted = #{deleted}</if>
+            <if test="createTime != null "> and createTime = #{createTime}</if>
+            <if test="platformGroupId != null "> and platformGroupId = #{platformGroupId}</if>
+            <if test="platformTeamId != null "> and platformTeamId = #{platformTeamId}</if>
+            <if test="enterDate != null "> and enterDate = #{enterDate}</if>
+            <if test="exitDate != null "> and exitDate = #{exitDate}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+        </where>
+    </select>
+
+    <select id="selectSurProjectAttendanceGroupById" parameterType="Long" resultMap="SurProjectAttendanceGroupResult">
+        <include refid="selectSurProjectAttendanceGroupVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSurProjectAttendanceGroup" parameterType="SurProjectAttendanceGroup" useGeneratedKeys="true" keyProperty="id">
+        insert into sur_project_attendance_group
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cfgid != null">cfgid,</if>
+            <if test="appId != null">app_id,</if>
+            <if test="serverid != null">serverid,</if>
+            <if test="bizLicense != null">bizLicense,</if>
+            <if test="companyCode != null">companyCode,</if>
+            <if test="companyId != null">companyId,</if>
+            <if test="companyName != null">companyName,</if>
+            <if test="companyTypeId != null">companyTypeId,</if>
+            <if test="vendorId != null">vendorId,</if>
+            <if test="name != null">name,</if>
+            <if test="leaderName != null">leaderName,</if>
+            <if test="leaderPhone != null">leaderPhone,</if>
+            <if test="teamId != null">teamId,</if>
+            <if test="teamName != null">teamName,</if>
+            <if test="type != null">type,</if>
+            <if test="leaderId != null">leaderId,</if>
+            <if test="deleted != null">deleted,</if>
+            <if test="createTimestamp != null">createTimestamp,</if>
+            <if test="platformGroupId != null">platformGroupId,</if>
+            <if test="platformTeamId != null">platformTeamId,</if>
+            <if test="enterDate != null">enterDate,</if>
+            <if test="exitDate != null">exitDate,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cfgid != null">#{cfgid},</if>
+            <if test="appId != null">#{appId},</if>
+            <if test="serverid != null">#{serverid},</if>
+            <if test="bizLicense != null">#{bizLicense},</if>
+            <if test="companyCode != null">#{companyCode},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="companyName != null">#{companyName},</if>
+            <if test="companyTypeId != null">#{companyTypeId},</if>
+            <if test="vendorId != null">#{vendorId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="leaderName != null">#{leaderName},</if>
+            <if test="leaderPhone != null">#{leaderPhone},</if>
+            <if test="teamId != null">#{teamId},</if>
+            <if test="teamName != null">#{teamName},</if>
+            <if test="type != null">#{type},</if>
+            <if test="leaderId != null">#{leaderId},</if>
+            <if test="deleted != null">#{deleted},</if>
+            <if test="createTimestamp != null">#{createTimestamp},</if>
+            <if test="platformGroupId != null">#{platformGroupId},</if>
+            <if test="platformTeamId != null">#{platformTeamId},</if>
+            <if test="enterDate != null">#{enterDate},</if>
+            <if test="exitDate != null">#{exitDate},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSurProjectAttendanceGroup" parameterType="SurProjectAttendanceGroup">
+        update sur_project_attendance_group
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cfgid != null">cfgid = #{cfgid},</if>
+            <if test="appId != null">app_id = #{appId},</if>
+            <if test="serverid != null">serverid = #{serverid},</if>
+            <if test="bizLicense != null">bizLicense = #{bizLicense},</if>
+            <if test="companyCode != null">companyCode = #{companyCode},</if>
+            <if test="companyId != null">companyId = #{companyId},</if>
+            <if test="companyName != null">companyName = #{companyName},</if>
+            <if test="companyTypeId != null">companyTypeId = #{companyTypeId},</if>
+            <if test="vendorId != null">vendorId = #{vendorId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="leaderName != null">leaderName = #{leaderName},</if>
+            <if test="leaderPhone != null">leaderPhone = #{leaderPhone},</if>
+            <if test="teamId != null">teamId = #{teamId},</if>
+            <if test="teamName != null">teamName = #{teamName},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="leaderId != null">leaderId = #{leaderId},</if>
+            <if test="deleted != null">deleted = #{deleted},</if>
+            <if test="createTimestamp != null">createTimestamp = #{createTimestamp},</if>
+            <if test="platformGroupId != null">platformGroupId = #{platformGroupId},</if>
+            <if test="platformTeamId != null">platformTeamId = #{platformTeamId},</if>
+            <if test="enterDate != null">enterDate = #{enterDate},</if>
+            <if test="exitDate != null">exitDate = #{exitDate},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSurProjectAttendanceGroupById" parameterType="Long">
+        delete from sur_project_attendance_group where id = #{id}
+    </delete>
+
+    <delete id="deleteSurProjectAttendanceGroupByIds" parameterType="String">
+        delete from sur_project_attendance_group where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSurProjectAttendanceGroupByParams" parameterType="String">
+        delete from sur_project_attendance_group where CONCAT(app_id,'-',serverid) in
+        <foreach collection="list" item="item" separator=","  open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <insert id="batchSurProjectAttendanceGroup">
+        insert into sur_project_attendance_group(id,cfgid,app_id,serverid,bizLicense,companyCode,companyId,companyName,companyTypeId,vendorId,name,leaderName,leaderPhone,teamId,teamName,type,leaderId,deleted,createTimestamp,platformGroupId,platformTeamId,enterDate,exitDate,remark,create_by,create_time,update_by,update_time) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.id}, #{item.cfgid}, #{item.appId}, #{item.serverid}, #{item.bizLicense}, #{item.companyCode}, #{item.companyId}, #{item.companyName},#{item.companyTypeId}, #{item.vendorId}, #{item.name}, #{item.leaderName}, #{item.leaderPhone}, #{item.teamId}, #{item.teamName}, #{item.type}, #{item.leaderId}, #{item.deleted}, #{item.createTimestamp}, #{item.platformGroupId}, #{item.platformTeamId}, #{item.enterDate},
+            #{item.exitDate}, #{item.remark}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+</mapper>

ruoyi-yanzhu/src/main/resources/mapper/system/SurProjectAttendanceUserMapper.xml

@@ -0,0 +1,812 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.xd.system.mapper.SurProjectAttendanceUserMapper">
+    
+    <resultMap type="SurProjectAttendanceUser" id="SurProjectAttendanceUserResult">
+        <result property="id"    column="id"    />
+        <result property="cfgid"    column="cfgid"    />
+        <result property="appId"    column="app_id"    />
+        <result property="vendorsCode"    column="vendors_code"    />
+        <result property="workerId"    column="workerId"    />
+        <result property="laborWorkerId"    column="laborWorkerId"    />
+        <result property="workerCategory"    column="workerCategory"    />
+        <result property="qrCode"    column="qrCode"    />
+        <result property="name"    column="name"    />
+        <result property="ethnic"    column="ethnic"    />
+        <result property="nativePlace"    column="nativePlace"    />
+        <result property="gender"    column="gender"    />
+        <result property="birthDate"    column="birthDate"    />
+        <result property="phone"    column="phone"    />
+        <result property="degreeName"    column="degreeName"    />
+        <result property="photo"    column="photo"    />
+        <result property="recentPhoto"    column="recentPhoto"    />
+        <result property="groupId"    column="groupId"    />
+        <result property="groupName"    column="groupName"    />
+        <result property="leader"    column="leader"    />
+        <result property="workTypeCode"    column="workTypeCode"    />
+        <result property="workTypeName"    column="workTypeName"    />
+        <result property="specWorkType"    column="specWorkType"    />
+        <result property="hatCode"    column="hatCode"    />
+        <result property="state"    column="state"    />
+        <result property="enterDate"    column="enterDate"    />
+        <result property="exitDate"    column="exitDate"    />
+        <result property="companyId"    column="companyId"    />
+        <result property="companyName"    column="companyName"    />
+        <result property="vendorId"    column="vendorId"    />
+        <result property="teamId"    column="teamId"    />
+        <result property="teamName"    column="teamName"    />
+        <result property="enterType"    column="enterType"    />
+        <result property="other"    column="other"    />
+        <result property="remark"    column="remark"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="projectId" column="project_id"/>
+        <result property="subDeptId" column="sub_dept_id"/>
+        <result property="companyTypeId" column="companyTypeId"/>
+    </resultMap>
+
+    <sql id="selectSurProjectAttendanceUserVo">
+        SELECT * FROM (
+                          SELECT a.*,b.project_id,b.sub_dept_id
+                          FROM   sur_project_attendance_user a,sur_project_attendance_cfg b
+                          WHERE a.cfgid=b.id )
+                          sur_project_attendance_user
+    </sql>
+    <select id="selectSurProjectAttendanceUserListJgw" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        SELECT u.id,u.cfgid,u.app_id,u.vendors_code,u.workerId,u.laborWorkerId,u.workerCategory,u.qrCode,u.name,
+        u.ethnic,u.nativePlace,u.gender,u.birthDate,u.phone,u.degreeName,u.photo,u.recentPhoto,
+        u.groupId,u.leader,u.workTypeCode,u.specWorkType,
+        u.hatCode,u.state,u.enterDate,u.exitDate,u.companyId,u.vendorId,
+        u.teamId,u.teamName,u.enterType,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
+        c.project_id,c.sub_dept_id,u.companyName,u.workTypeName,g.teamname groupName,g.companyName remark
+        FROM sur_project_attendance_user u,sur_project_attendance_cfg c,sur_project_attendance_group g
+        WHERE u.cfgid=c.id AND g.companyid=u.companyid AND u.vendors_code='jgw'
+        <if test="companyTypeId!=null">
+            <if test="companyTypeId>100">
+                <if test="companyTypeId==101">
+                    and g.companyTypeId in (1,6)
+                </if>
+                <if test="companyTypeId==102">
+                    and g.companyTypeId =8
+                </if>
+                <if test="companyTypeId==103">
+                    and g.companyTypeId in (0,2,3,4,5)
+                </if>
+            </if>
+            <if test="companyTypeId &lt;100">
+                and g.companyTypeId=#{companyTypeId}
+            </if>
+        </if>
+        <if test="cfgid != null "> and u.cfgid = #{cfgid}</if>
+        <if test="appId != null "> and u.app_id = #{appId}</if>
+        <if test="vendorsCode != null  and vendorsCode != ''"> and u.vendors_code = #{vendorsCode}</if>
+        <if test="workerId != null "> and u.workerId = #{workerId}</if>
+        <if test="laborWorkerId != null "> and u.laborWorkerId = #{laborWorkerId}</if>
+        <if test="workerCategory != null "> and u.workerCategory = #{workerCategory}</if>
+        <if test="qrCode != null "> and u.qrCode = #{qrCode}</if>
+        <if test="name != null  and name != ''"> and u.name like concat('%', #{name}, '%')</if>
+        <if test="ethnic != null  and ethnic != ''"> and u.ethnic = #{ethnic}</if>
+        <if test="nativePlace != null  and nativePlace != ''"> and u.nativePlace = #{nativePlace}</if>
+        <if test="gender != null "> and u.gender = #{gender}</if>
+        <if test="birthDate != null "> and u.birthDate = #{birthDate}</if>
+        <if test="phone != null  and phone != ''"> and u.phone = #{phone}</if>
+        <if test="degreeName != null  and degreeName != ''"> and u.degreeName like concat('%', #{degreeName}, '%')</if>
+        <if test="photo != null  and photo != ''"> and u.photo = #{photo}</if>
+        <if test="recentPhoto != null  and recentPhoto != ''"> and u.recentPhoto = #{recentPhoto}</if>
+        <if test="groupId != null "> and u.groupId = #{groupId}</if>
+        <if test="groupName != null  and groupName != ''"> and u.groupName like concat('%', #{groupName}, '%')</if>
+        <if test="leader != null "> and u.leader = #{leader}</if>
+        <if test="workTypeCode != null  and workTypeCode != ''"> and u.workTypeCode = #{workTypeCode}</if>
+        <if test="workTypeName != null  and workTypeName != ''"> and u.workTypeName like concat('%', #{workTypeName}, '%')</if>
+        <if test="specWorkType != null "> and u.specWorkType = #{specWorkType}</if>
+        <if test="hatCode != null  and hatCode != ''"> and u.hatCode = #{hatCode}</if>
+        <if test="state != null "> and u.state = #{state}</if>
+        <if test="enterDate != null  and enterDate != ''"> and u.enterDate = #{enterDate}</if>
+        <if test="exitDate != null  and exitDate != ''"> and u.exitDate = #{exitDate}</if>
+        <if test="companyId != null "> and u.companyId = #{companyId}</if>
+        <if test="companyName != null  and companyName != ''"> and u.companyName like concat('%', #{companyName}, '%')</if>
+        <if test="vendorId != null "> and u.vendorId = #{vendorId}</if>
+        <if test="teamId != null "> and u.teamId = #{teamId}</if>
+        <if test="teamName != null  and teamName != ''"> and u.teamName like concat('%', #{teamName}, '%')</if>
+        <if test="enterType != null  and enterType != ''"> and u.enterType = #{enterType}</if>
+        <if test="other != null  and other != ''"> and u.other = #{other}</if>
+        <if test="projectId != null  and projectId > 0 "> and c.project_id = #{projectId}</if>
+        <if test="subDeptId != null  and subDeptId >0 "> and c.sub_dept_id = #{subDeptId}</if>
+        <if test="isDel != null "> and u.is_del = #{isDel}</if>
+    </select>
+
+    <select id="querySurProjectAttendanceUserList" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        SELECT * FROM (
+        SELECT a.id,
+        a.cfgid,
+        a.app_id,
+        a.vendors_code,
+        a.workerId,
+        a.laborWorkerId,
+        a.workerCategory,
+        a.qrCode,
+        a.name,
+        a.ethnic,
+        a.nativePlace,
+        a.gender,
+        a.birthDate,
+        a.phone,
+        a.degreeName,
+        a.photo,
+        a.recentPhoto,
+        a.groupId,
+        a.groupName,
+        a.leader,
+        a.workTypeCode,
+        a.workTypeName,
+        a.specWorkType,
+        a.hatCode,
+        a.state,
+        a.enterDate,
+        a.exitDate,
+        a.companyId,
+        a.companyName,
+        a.vendorId,
+        a.teamId,
+        a.teamName,
+        a.enterType,
+        a.other,
+        a.is_del,
+        a.create_by,
+        a.create_time,
+        a.update_by,
+        a.update_time,b.project_id,b.sub_dept_id,g.companyTypeId,g.companyName as remark
+        FROM   sur_project_attendance_user a,sur_project_attendance_cfg b,view_sur_project_attendance_group g
+        WHERE a.cfgid=b.id and a.companyId=g.companyId and g.id in(select min(id) from view_sur_project_attendance_group group by companyid)
+        )
+        sur_project_attendance_user
+        <where>
+            <if test="companyTypeId!=null">
+                <if test="companyTypeId>100">
+                    <if test="companyTypeId==101">
+                        and companyTypeId in (1,6)
+                    </if>
+                    <if test="companyTypeId==102">
+                        and companyTypeId =8
+                    </if>
+                    <if test="companyTypeId==103">
+                        and companyTypeId in (0,2,3,4,5)
+                    </if>
+                </if>
+                <if test="companyTypeId &lt;100">
+                    and companyTypeId=#{companyTypeId}
+                </if>
+            </if>
+            <if test="cfgid != null "> and cfgid = #{cfgid}</if>
+            <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="vendorsCode != null  and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if>
+            <if test="workerId != null "> and workerId = #{workerId}</if>
+            <if test="laborWorkerId != null "> and laborWorkerId = #{laborWorkerId}</if>
+            <if test="workerCategory != null "> and workerCategory = #{workerCategory}</if>
+            <if test="qrCode != null "> and qrCode = #{qrCode}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="ethnic != null  and ethnic != ''"> and ethnic = #{ethnic}</if>
+            <if test="nativePlace != null  and nativePlace != ''"> and nativePlace = #{nativePlace}</if>
+            <if test="gender != null "> and gender = #{gender}</if>
+            <if test="birthDate != null "> and birthDate = #{birthDate}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="degreeName != null  and degreeName != ''"> and degreeName like concat('%', #{degreeName}, '%')</if>
+            <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
+            <if test="recentPhoto != null  and recentPhoto != ''"> and recentPhoto = #{recentPhoto}</if>
+            <if test="groupId != null "> and groupId = #{groupId}</if>
+            <if test="groupName != null  and groupName != ''"> and groupName like concat('%', #{groupName}, '%')</if>
+            <if test="leader != null "> and leader = #{leader}</if>
+            <if test="workTypeCode != null  and workTypeCode != ''"> and workTypeCode = #{workTypeCode}</if>
+            <if test="workTypeName != null  and workTypeName != ''"> and workTypeName like concat('%', #{workTypeName}, '%')</if>
+            <if test="specWorkType != null "> and specWorkType = #{specWorkType}</if>
+            <if test="hatCode != null  and hatCode != ''"> and hatCode = #{hatCode}</if>
+            <if test="state != null "> and state = #{state}</if>
+            <if test="enterDate != null  and enterDate != ''"> and enterDate = #{enterDate}</if>
+            <if test="exitDate != null  and exitDate != ''"> and exitDate = #{exitDate}</if>
+            <if test="companyId != null "> and companyId = #{companyId}</if>
+            <if test="companyName != null  and companyName != ''"> and companyName like concat('%', #{companyName}, '%')</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="teamId != null "> and teamId = #{teamId}</if>
+            <if test="teamName != null  and teamName != ''"> and teamName like concat('%', #{teamName}, '%')</if>
+            <if test="enterType != null  and enterType != ''"> and enterType = #{enterType}</if>
+            <if test="other != null  and other != ''"> and other = #{other}</if>
+            <if test="projectId != null  and projectId > 0 "> and project_id = #{projectId}</if>
+            <if test="subDeptId != null  and subDeptId >0 "> and sub_dept_id = #{subDeptId}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    <select id="selectSurProjectAttendanceUserList" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        <include refid="selectSurProjectAttendanceUserVo"/>
+        <where>
+            <if test="companyTypeId!=null">
+                <if test="companyTypeId>100">
+                    <if test="companyTypeId==101">
+                        and companyTypeId in (1,6)
+                    </if>
+                    <if test="companyTypeId==102">
+                        and companyTypeId =8
+                    </if>
+                    <if test="companyTypeId==103">
+                        and companyTypeId in (0,2,3,4,5)
+                    </if>
+                </if>
+                <if test="companyTypeId &lt;100">
+                    and companyTypeId=#{companyTypeId}
+                </if>
+            </if>
+            <if test="cfgid != null "> and cfgid = #{cfgid}</if>
+            <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="vendorsCode != null  and vendorsCode != ''"> and vendors_code = #{vendorsCode}</if>
+            <if test="workerId != null "> and workerId = #{workerId}</if>
+            <if test="laborWorkerId != null "> and laborWorkerId = #{laborWorkerId}</if>
+            <if test="workerCategory != null "> and workerCategory = #{workerCategory}</if>
+            <if test="qrCode != null "> and qrCode = #{qrCode}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="ethnic != null  and ethnic != ''"> and ethnic = #{ethnic}</if>
+            <if test="nativePlace != null  and nativePlace != ''"> and nativePlace = #{nativePlace}</if>
+            <if test="gender != null "> and gender = #{gender}</if>
+            <if test="birthDate != null "> and birthDate = #{birthDate}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="degreeName != null  and degreeName != ''"> and degreeName like concat('%', #{degreeName}, '%')</if>
+            <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
+            <if test="recentPhoto != null  and recentPhoto != ''"> and recentPhoto = #{recentPhoto}</if>
+            <if test="groupId != null "> and groupId = #{groupId}</if>
+            <if test="groupName != null  and groupName != ''"> and groupName like concat('%', #{groupName}, '%')</if>
+            <if test="leader != null "> and leader = #{leader}</if>
+            <if test="workTypeCode != null  and workTypeCode != ''"> and workTypeCode = #{workTypeCode}</if>
+            <if test="workTypeName != null  and workTypeName != ''"> and workTypeName like concat('%', #{workTypeName}, '%')</if>
+            <if test="specWorkType != null "> and specWorkType = #{specWorkType}</if>
+            <if test="hatCode != null  and hatCode != ''"> and hatCode = #{hatCode}</if>
+            <if test="state != null "> and state = #{state}</if>
+            <if test="enterDate != null  and enterDate != ''"> and enterDate = #{enterDate}</if>
+            <if test="exitDate != null  and exitDate != ''"> and exitDate = #{exitDate}</if>
+            <if test="companyId != null "> and companyId = #{companyId}</if>
+            <if test="companyName != null  and companyName != ''"> and companyName like concat('%', #{companyName}, '%')</if>
+            <if test="vendorId != null "> and vendorId = #{vendorId}</if>
+            <if test="teamId != null "> and teamId = #{teamId}</if>
+            <if test="teamName != null  and teamName != ''"> and teamName like concat('%', #{teamName}, '%')</if>
+            <if test="enterType != null  and enterType != ''"> and enterType = #{enterType}</if>
+            <if test="other != null  and other != ''"> and other = #{other}</if>
+            <if test="projectId != null  and projectId > 0 "> and project_id = #{projectId}</if>
+            <if test="subDeptId != null  and subDeptId >0 "> and sub_dept_id = #{subDeptId}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    <select id="selectSurProjectAttendanceUserById" parameterType="Long" resultMap="SurProjectAttendanceUserResult">
+        <include refid="selectSurProjectAttendanceUserVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="findCurrentAttendanceUser" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        select u.companyId,u.companyName,u.`name`,u.recentPhoto,u.gender,u.birthDate,u.ethnic,u.nativePlace,u.phone,
+               u.workTypeName,u.specWorkType,u.groupName,g.companyTypeId,u.workTypeCode
+        from sur_project_attendance_user u
+                 left join sur_project_attendance_group g on u.companyId = g.companyId and g.cfgid = u.cfgid
+        where u.cfgid=#{cfgid} and u.workerId=#{workerId}
+    </select>
+
+    <select id="findYzCurrentAttendanceUser" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        select u.companyId,g.companyName,u.`name`,u.recentPhoto,u.gender,u.birthDate,u.ethnic,u.nativePlace,u.phone,
+               u.workTypeName,u.specWorkType,u.groupName,g.companyTypeId,u.workTypeCode
+        from sur_project_attendance_user u
+                 left join sur_project_attendance_group g on u.groupId = g.serverid and g.cfgid = u.cfgid
+        where u.cfgid=#{cfgid} and u.workerId=#{workerId} ORDER BY u.id desc LIMIT 1
+    </select>
+
+    <insert id="insertSurProjectAttendanceUser" parameterType="SurProjectAttendanceUser" useGeneratedKeys="true" keyProperty="id">
+        insert into sur_project_attendance_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cfgid != null">cfgid,</if>
+            <if test="appId != null">app_id,</if>
+            <if test="vendorsCode != null">vendors_code,</if>
+            <if test="workerId != null">workerId,</if>
+            <if test="laborWorkerId != null">laborWorkerId,</if>
+            <if test="workerCategory != null">workerCategory,</if>
+            <if test="qrCode != null">qrCode,</if>
+            <if test="name != null">name,</if>
+            <if test="ethnic != null">ethnic,</if>
+            <if test="nativePlace != null">nativePlace,</if>
+            <if test="gender != null">gender,</if>
+            <if test="birthDate != null">birthDate,</if>
+            <if test="phone != null and phone != ''">phone,</if>
+            <if test="degreeName != null">degreeName,</if>
+            <if test="photo != null">photo,</if>
+            <if test="recentPhoto != null">recentPhoto,</if>
+            <if test="groupId != null">groupId,</if>
+            <if test="groupName != null">groupName,</if>
+            <if test="leader != null">leader,</if>
+            <if test="workTypeCode != null">workTypeCode,</if>
+            <if test="workTypeName != null">workTypeName,</if>
+            <if test="specWorkType != null">specWorkType,</if>
+            <if test="hatCode != null">hatCode,</if>
+            <if test="state != null">state,</if>
+            <if test="enterDate != null">enterDate,</if>
+            <if test="exitDate != null">exitDate,</if>
+            <if test="companyId != null">companyId,</if>
+            <if test="companyName != null">companyName,</if>
+            <if test="vendorId != null">vendorId,</if>
+            <if test="teamId != null">teamId,</if>
+            <if test="teamName != null">teamName,</if>
+            <if test="enterType != null">enterType,</if>
+            <if test="other != null and other != ''">other,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cfgid != null">#{cfgid},</if>
+            <if test="appId != null">#{appId},</if>
+            <if test="vendorsCode != null">#{vendorsCode},</if>
+            <if test="workerId != null">#{workerId},</if>
+            <if test="laborWorkerId != null">#{laborWorkerId},</if>
+            <if test="workerCategory != null">#{workerCategory},</if>
+            <if test="qrCode != null">#{qrCode},</if>
+            <if test="name != null">#{name},</if>
+            <if test="ethnic != null">#{ethnic},</if>
+            <if test="nativePlace != null">#{nativePlace},</if>
+            <if test="gender != null">#{gender},</if>
+            <if test="birthDate != null">#{birthDate},</if>
+            <if test="phone != null and phone != ''">#{phone},</if>
+            <if test="degreeName != null">#{degreeName},</if>
+            <if test="photo != null">#{photo},</if>
+            <if test="recentPhoto != null">#{recentPhoto},</if>
+            <if test="groupId != null">#{groupId},</if>
+            <if test="groupName != null">#{groupName},</if>
+            <if test="leader != null">#{leader},</if>
+            <if test="workTypeCode != null">#{workTypeCode},</if>
+            <if test="workTypeName != null">#{workTypeName},</if>
+            <if test="specWorkType != null">#{specWorkType},</if>
+            <if test="hatCode != null">#{hatCode},</if>
+            <if test="state != null">#{state},</if>
+            <if test="enterDate != null">#{enterDate},</if>
+            <if test="exitDate != null">#{exitDate},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="companyName != null">#{companyName},</if>
+            <if test="vendorId != null">#{vendorId},</if>
+            <if test="teamId != null">#{teamId},</if>
+            <if test="teamName != null">#{teamName},</if>
+            <if test="enterType != null">#{enterType},</if>
+            <if test="other != null and other != ''">#{other},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSurProjectAttendanceUser" parameterType="SurProjectAttendanceUser">
+        update sur_project_attendance_user
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cfgid != null">cfgid = #{cfgid},</if>
+            <if test="appId != null">app_id = #{appId},</if>
+            <if test="vendorsCode != null">vendors_code = #{vendorsCode},</if>
+            <if test="workerId != null">workerId = #{workerId},</if>
+            <if test="laborWorkerId != null">laborWorkerId = #{laborWorkerId},</if>
+            <if test="workerCategory != null">workerCategory = #{workerCategory},</if>
+            <if test="qrCode != null">qrCode = #{qrCode},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="ethnic != null">ethnic = #{ethnic},</if>
+            <if test="nativePlace != null">nativePlace = #{nativePlace},</if>
+            <if test="gender != null">gender = #{gender},</if>
+            <if test="birthDate != null">birthDate = #{birthDate},</if>
+            <if test="phone != null and phone != ''">phone = #{phone},</if>
+            <if test="degreeName != null">degreeName = #{degreeName},</if>
+            <if test="photo != null">photo = #{photo},</if>
+            <if test="recentPhoto != null">recentPhoto = #{recentPhoto},</if>
+            <if test="groupId != null">groupId = #{groupId},</if>
+            <if test="groupName != null">groupName = #{groupName},</if>
+            <if test="leader != null">leader = #{leader},</if>
+            <if test="workTypeCode != null">workTypeCode = #{workTypeCode},</if>
+            <if test="workTypeName != null">workTypeName = #{workTypeName},</if>
+            <if test="specWorkType != null">specWorkType = #{specWorkType},</if>
+            <if test="hatCode != null">hatCode = #{hatCode},</if>
+            <if test="state != null">state = #{state},</if>
+            <if test="enterDate != null">enterDate = #{enterDate},</if>
+            <if test="exitDate != null">exitDate = #{exitDate},</if>
+            <if test="companyId != null">companyId = #{companyId},</if>
+            <if test="companyName != null">companyName = #{companyName},</if>
+            <if test="vendorId != null">vendorId = #{vendorId},</if>
+            <if test="teamId != null">teamId = #{teamId},</if>
+            <if test="teamName != null">teamName = #{teamName},</if>
+            <if test="enterType != null">enterType = #{enterType},</if>
+            <if test="other != null and other != ''">other = #{other},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSurProjectAttendanceUserById" parameterType="Long">
+        delete from sur_project_attendance_user where id = #{id}
+    </delete>
+
+    <delete id="deleteSurProjectAttendanceUserByIds" parameterType="String">
+        delete from sur_project_attendance_user where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteSurProjectAttendanceUserByParams" parameterType="String">
+        delete from sur_project_attendance_user where CONCAT(app_id,'-',workerId) in
+        <foreach collection="list" item="item" separator=","  open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <insert id="batchSurProjectAttendanceUser">
+        insert into sur_project_attendance_user( id, cfgid, vendors_code, workerId, laborWorkerId, workerCategory, qrCode, name, ethnic, nativePlace, gender, birthDate, phone, degreeName, photo, recentPhoto, groupId, groupName, leader, workTypeCode, workTypeName, specWorkType, hatCode, state, enterDate, exitDate, companyId, companyName, vendorId, teamId, teamName, enterType, other, remark, is_del, create_by, create_time, update_by, update_time) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.cfgid}, #{item.vendorsCode}, #{item.workerId}, #{item.laborWorkerId}, #{item.workerCategory}, #{item.qrCode}, #{item.name}, #{item.ethnic}, #{item.nativePlace}, #{item.gender}, #{item.birthDate}, #{item.phone}, #{item.degreeName}, #{item.photo}, #{item.recentPhoto}, #{item.groupId}, #{item.groupName}, #{item.leader}, #{item.workTypeCode}, #{item.workTypeName}, #{item.specWorkType}, #{item.hatCode}, #{item.state}, #{item.enterDate}, #{item.exitDate}, #{item.companyId}, #{item.companyName}, #{item.vendorId}, #{item.teamId}, #{item.teamName}, #{item.enterType}, #{item.other}, #{item.remark}, #{item.isDel}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime})
+        </foreach>
+    </insert>
+
+    <sql id="sqlAttendanceData">
+        (
+            SELECT * FROM sur_project_attendance_data WHERE DATE(attendance_time)=date(#{createBy}) AND cfgid IN (
+        SELECT id FROM sur_project_attendance_cfg WHERE project_id=#{projectId} AND sub_dept_id=#{subDeptId}
+            ) ) xx
+    </sql>
+    <select id="queryAttendanceData" parameterType="SurProjectAttendanceCfg"  resultMap="SurProjectAttendanceUserResult">
+        select * from (
+        select n.*,m.inTime,m.outTime from (
+
+        SELECT * FROM (
+        SELECT workerId,attendance_time inTime,null outtime FROM sur_project_attendance_data WHERE id IN (
+        SELECT min(id) id  FROM <include refid="sqlAttendanceData"/> WHERE attendance_type='e' GROUP BY workerId )) X WHERE workerId NOT IN (
+        SELECT workerId  FROM <include refid="sqlAttendanceData"/> WHERE attendance_type='l' GROUP BY workerId
+        )
+
+        union
+
+        select * from (
+        select workerId,null inTime,attendance_time outTime from sur_project_attendance_data where id in (
+        select max(id) id  from <include refid="sqlAttendanceData"/> where attendance_type='l' group by workerId )) x where workerId not in (
+        SELECT workerId  FROM <include refid="sqlAttendanceData"/> WHERE attendance_type='e' GROUP BY workerId
+        )
+
+        union
+
+        select x.workerId,y.attendance_time inTime,x.attendance_time outTime from (
+        SELECT id,workerId,attendance_time FROM sur_project_attendance_data WHERE id IN (
+        SELECT MAX(id) id  FROM <include refid="sqlAttendanceData"/> WHERE attendance_type='l' GROUP BY workerId )
+        ) x cross join (
+
+        SELECT id,workerId,attendance_time FROM sur_project_attendance_data WHERE id IN (
+        SELECT MIN(id) id  FROM <include refid="sqlAttendanceData"/> WHERE attendance_type='e' GROUP BY workerId )
+        ) y on x.workerId=y.workerId
+
+        ) m left join sur_project_attendance_user n on  m.workerId=n.workerId
+        ) oo
+    </select>
+
+    <select id="countAttendance" resultType="Long" parameterType="SurProjectAttendanceCfg">
+        select count(1) cnt from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g
+        where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
+          and u.workerid in(
+            SELECT workerid FROM sur_project_attendance_data WHERE  DATE(attendance_time)=date(#{createBy}) AND cfgid IN (
+            SELECT id FROM sur_project_attendance_cfg WHERE project_id=#{projectId} AND sub_dept_id=#{subDeptId}
+            )  group by workerid
+            )
+    </select>
+    <select id="queryAttendanceByUserIds" parameterType="SurProjectAttendanceUser"  resultMap="SurProjectAttendanceUserResult">
+        select workerid,attendance_type name,min(attendance_time) inTime,max(attendance_time) outTime from sur_project_attendance_data
+        where DATE(attendance_time)=date(#{createBy})
+        <if test="workerIds !=null and workerIds.size()>0">
+            and workerid in
+            <foreach collection="workerIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by workerid,attendance_type
+    </select>
+    <select id="queryAttendanceUsers"  parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+
+        select u.* from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g
+        where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
+          and u.workerid in(
+            SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=date(#{createBy}) AND cfgid IN (
+            SELECT id FROM sur_project_attendance_cfg WHERE project_id=#{projectId} AND sub_dept_id=#{subDeptId}
+            ) group by workerid
+            )
+        order by u.id  limit #{index},#{size}
+    </select>
+
+
+    <select id="countTodayAttendance" resultType="Long" parameterType="SurProjectAttendanceUser">
+        select count(1) cnt from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g
+        where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
+        and u.workerid in(
+        SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE() group by workerid
+        )
+        <if test="id==1">
+            and g.companyTypeId in (1,6)
+        </if>
+        <if test="id==2">
+            and g.companyTypeId in (0,2,3,4,5)
+        </if>
+        <if test="id==8">
+            and g.companyTypeId =8
+        </if>
+        <if test="projectId!=null and projectId>0">
+            and c.project_id=#{projectId}
+        </if>
+        <if test="deptId!=null and deptId>0">
+            and  c.project_id in (SELECT id FROM sur_project WHERE deptid=#{deptId})
+        </if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and c.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+    <select id="todayAttendanceOld"  parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        select a.* ,
+        (select min(attendance_time) from sur_project_attendance_data b where b.workerId=a.workerId and date(b.attendance_time)=CURDATE() and b.attendance_type='e') inTime,
+        (SELECT Max(attendance_time) FROM sur_project_attendance_data b WHERE b.workerId=a.workerId AND DATE(b.attendance_time)=CURDATE() AND b.attendance_type='l') outTime
+        from (
+        select u.* from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g
+        where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
+        and u.workerid in(
+        SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE()
+        )
+
+        <if test="id==1">
+            and g.companyTypeId in (1,6)
+        </if>
+        <if test="id==2">
+            and g.companyTypeId in (0,2,3,4,5)
+        </if>
+        <if test="id==8">
+            and g.companyTypeId =8
+        </if>
+        <if test="projectId!=null and projectId>0">
+            and c.project_id=#{projectId}
+        </if>
+        <if test="deptId!=null and deptId>0">
+            and  c.project_id in (SELECT id FROM sur_project WHERE deptid=#{deptId})
+        </if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and c.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        order by u.id  limit #{index},#{size} ) a
+    </select>
+    <select id="todayAttendance"  parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+
+        select u.* from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g
+        where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId
+        and u.workerid in(
+        SELECT workerid FROM sur_project_attendance_data WHERE DATE(attendance_time)=CURDATE()  group by workerid
+        )
+
+        <if test="id==1">
+            and g.companyTypeId in (1,6)
+        </if>
+        <if test="id==2">
+            and g.companyTypeId in (0,2,3,4,5)
+        </if>
+        <if test="id==8">
+            and g.companyTypeId =8
+        </if>
+        <if test="projectId!=null and projectId>0">
+            and c.project_id=#{projectId}
+        </if>
+        <if test="deptId!=null and deptId>0">
+            and  c.project_id in (SELECT id FROM sur_project WHERE deptid=#{deptId})
+        </if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and c.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        order by u.id  limit #{index},#{size}
+    </select>
+    <select id="todayAttendanceData"  parameterType="java.util.List" resultMap="SurProjectAttendanceUserResult">
+        select workerid,attendance_type name,min(attendance_time) inTime,max(attendance_time) outTime from sur_project_attendance_data where DATE(attendance_time)=CURDATE()
+        <if test="list !=null and list.size()>0">
+            and workerid in
+            <foreach collection="list"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by workerid,attendance_type
+    </select>
+
+    <select id="todayAttendanceOtherData"  parameterType="map" resultMap="SurProjectAttendanceUserResult">
+        select workerid,min(attendance_time) inTime,max(attendance_time) outTime from sur_project_attendance_data where cfgid=#{cfgid} and DATE(attendance_time)=#{date}
+        <if test="list !=null and list.size()>0">
+            and workerid in
+            <foreach collection="list"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by workerid
+    </select>
+
+    <select id="queryWorkerOnDuty" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        SELECT u.id,u.cfgid,u.app_id,u.vendors_code,u.workerId,u.laborWorkerId,u.workerCategory,u.qrCode,u.name,
+        u.ethnic,u.nativePlace,u.gender,u.birthDate,u.phone,u.photo,u.recentPhoto,
+        u.groupId,u.leader,u.workTypeCode,u.specWorkType,
+        u.hatCode,u.state,u.enterDate,u.exitDate,u.companyId,u.vendorId,
+        u.teamId,u.teamName,u.enterType,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
+        b.project_id,b.sub_dept_id,u.companyName,u.workTypeName,u.groupName,
+        b.project_id,b.sub_dept_id, g.teamname remark,g.companyName degreeName
+        FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project sp
+        WHERE u.cfgid=b.id and u.state=0 and u.companyId=g.companyId and sp.isDel=0 and b.project_id = sp.id
+        <if test="id==101">
+            and g.companyTypeId in (1,6)
+        </if>
+        <if test="id==102">
+            and g.companyTypeId =8
+        </if>
+        <if test="id==103">
+            and g.companyTypeId in (0,2,3,4,5)
+        </if>
+        <if test="projectId!=null and projectId>0">
+            and b.project_id=#{projectId}
+        </if>
+        <if test="deptId!=null and deptId>0">
+            and sp.deptId=#{deptId}
+        </if>
+        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and b.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="attendanceUserList" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        SELECT u.id,u.cfgid,u.app_id,u.vendors_code,u.workerId,u.laborWorkerId,u.workerCategory,u.qrCode,u.name,
+        u.ethnic,u.nativePlace,u.gender,u.birthDate,u.phone,u.photo,u.recentPhoto,
+        u.groupId,u.leader,u.workTypeCode,u.specWorkType,
+        u.hatCode,u.state,u.enterDate,u.exitDate,u.companyId,u.vendorId,
+        u.teamId,u.teamName,u.enterType,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
+        b.project_id,b.sub_dept_id,u.companyName,u.workTypeName,u.groupName,
+        b.project_id,b.sub_dept_id, g.teamname remark,g.companyName degreeName,g.companyTypeId
+        FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project sp
+        WHERE u.cfgid=b.id and u.companyId=g.companyId and sp.isDel=0 and b.project_id = sp.id
+        <if test="companyTypeId==101">
+            and g.companyTypeId in (1,6)
+        </if>
+        <if test="companyTypeId==102">
+            and g.companyTypeId =8
+        </if>
+        <if test="companyTypeId==103">
+            and g.companyTypeId in (0,2,3,4,5)
+        </if>
+        <if test="projectId!=null and projectId>0">
+            and b.project_id=#{projectId}
+        </if>
+        <if test="id != null"> and u.id = #{id}</if>
+        <if test="state != null "> and u.state = #{state}</if>
+        <if test="name != null  and name != ''"> and u.name like concat('%', #{name}, '%')</if>
+        order by id
+    </select>
+
+    <select id="groupByWorkerOnDutyByDept"  parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        SELECT p.id, p.projectName NAME,c.dept_name groupName,g.companyTypeId companyId,COUNT(1) cfgid
+        FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project p,sys_dept c
+        where u.cfgid=b.id and u.state=0 and u.companyId=g.companyId and b.project_id=p.id and c.dept_id=b.sub_dept_id
+        and p.isDel=0
+        and g.companyTypeId in (1,6,0,2,3,4,5,8)
+        <if test="deptId!=null and deptId>0">
+            and p.deptId=#{deptId}
+        </if>
+        <if test='proType != null and proType != "" and proType != "0"'> and p.projectType = #{proType}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and b.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by p.projectName,c.dept_name,g.companyTypeId,p.id
+        order by p.id
+    </select>
+
+    <select id="groupUserByParams"  parameterType="SurProjectAttendanceUser" resultType="Map">
+        select '1' as type,g.companyTypeId,count(1) as total
+        from sur_project_attendance_user u
+        left join view_sur_project_attendance_group g on g.cfgid = u.cfgid and u.companyId=g.companyId
+        where u.cfgid in (select cfg.id from sur_project_attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
+        and g.companyTypeId in (0,1,2,3,4,5,6,8)
+        and u.state=0
+        <if test="name != null  and name != ''"> and u.name like concat('%', #{name}, '%')</if>
+        group by g.companyTypeId
+        UNION ALL
+        select '2' as type,g.companyTypeId,count(1) as total
+        from sur_project_attendance_user u
+        left join view_sur_project_attendance_group g on g.cfgid = u.cfgid and u.companyId=g.companyId
+        where u.cfgid in (select cfg.id from sur_project_attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
+        and g.companyTypeId in (0,1,2,3,4,5,6,8)
+        and u.state=1
+        <if test="name != null  and name != ''"> and u.name like concat('%', #{name}, '%')</if>
+        group by g.companyTypeId
+    </select>
+
+    <select id="findUserAllByDays"  parameterType="Long" resultType="Map">
+        select '1' as type,g.companyTypeId,count(1) as total
+        from sur_project_attendance_user u
+                 left join view_sur_project_attendance_group g on g.cfgid = u.cfgid and u.companyId=g.companyId
+        where u.cfgid in (select cfg.id from sur_project_attendance_cfg cfg where cfg.project_id=#{projectId} and cfg.is_del=0)
+          and g.companyTypeId in (0,1,2,3,4,5,6,8)
+          and u.state=0
+        group by g.companyTypeId
+    </select>
+
+    <select id="groupByWorkerByDept"  parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        SELECT p.id, p.projectName NAME,c.dept_name groupName,g.companyTypeId companyId,COUNT(1) cfgid
+        FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project p,sys_dept c
+        where u.cfgid=b.id and u.state= #{state}  and u.companyId=g.companyId and b.project_id=p.id and c.dept_id=b.sub_dept_id
+        and p.isDel=0
+        and g.companyTypeId in (1,6,0,2,3,4,5,8)
+        <if test="deptId!=null and deptId>0">
+            and p.deptId=#{deptId}
+        </if>
+        <if test='proType != null and proType != "" and proType != "0"'> and p.projectType = #{proType}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and b.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by p.projectName,c.dept_name,g.companyTypeId,p.id
+        order by p.id
+    </select>
+
+    <select id="queryWorkerByState" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
+        SELECT u.id,u.cfgid,u.app_id,u.vendors_code,u.workerId,u.laborWorkerId,u.workerCategory,u.qrCode,u.name,
+        u.ethnic,u.nativePlace,u.gender,u.birthDate,u.phone,u.photo,u.recentPhoto,
+        u.groupId,u.leader,u.workTypeCode,u.specWorkType,
+        u.hatCode,u.state,u.enterDate,u.exitDate,u.companyId,u.vendorId,
+        u.teamId,u.teamName,u.enterType,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
+        b.project_id,b.sub_dept_id,u.companyName,u.workTypeName,u.groupName,
+        b.project_id,b.sub_dept_id, g.teamname remark,g.companyName degreeName
+        FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project sp
+        WHERE u.cfgid=b.id and u.state=#{state} and u.companyId=g.companyId and sp.isDel=0 and b.project_id = sp.id
+        <if test="id==101">
+            and g.companyTypeId in (1,6)
+        </if>
+        <if test="id==102">
+            and g.companyTypeId =8
+        </if>
+        <if test="id==103">
+            and g.companyTypeId in (0,2,3,4,5)
+        </if>
+        <if test="projectId!=null and projectId>0">
+            and b.project_id=#{projectId}
+        </if>
+        <if test="deptId!=null and deptId>0">
+            and sp.deptId=#{deptId}
+        </if>
+        <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and b.project_id in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+    </select>
+
+</mapper>

ruoyi-yanzhu/src/main/resources/mapper/system/SurProjectMapper.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.xd.system.mapper.SurProjectMapper">
+    
+    <resultMap type="SurProject" id="SurProjectResult">
+        <result property="id"    column="id"    />
+        <result property="deptId"    column="deptId"    />
+        <result property="projectName"    column="projectName"    />
+        <result property="projectCode"    column="projectCode"    />
+        <result property="paretProjectName"    column="paretProjectName"    />
+        <result property="paretProjectCode"    column="paretProjectCode"    />
+        <result property="simpleName"    column="simpleName"    />
+        <result property="projectType"    column="projectType"    />
+        <result property="projiectLevel"    column="projiectLevel"    />
+        <result property="projectRegional"    column="projectRegional"    />
+        <result property="projectAddress"    column="projectAddress"    />
+        <result property="projectNature"    column="projectNature"    />
+        <result property="licenceNumber"    column="licenceNumber"    />
+        <result property="projectApproval"    column="projectApproval"    />
+        <result property="projectPerson"    column="projectPerson"    />
+        <result property="projectPhone"    column="projectPhone"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="projectTimeLimit"    column="projectTimeLimit"    />
+        <result property="totalInvestment"    column="totalInvestment"    />
+        <result property="floorArea"    column="floorArea"    />
+        <result property="totalOutputValue"    column="totalOutputValue"    />
+        <result property="plannedCompletionTime"    column="plannedCompletionTime"    />
+        <result property="scheduledStartTime"    column="scheduledStartTime"    />
+        <result property="actualOperatingTime"    column="actualOperatingTime"    />
+        <result property="actualCompletionTime"    column="actualCompletionTime"    />
+        <result property="contractAmount"    column="contractAmount"    />
+        <result property="paidAmount"    column="paidAmount"    />
+        <result property="onAccountAmount"    column="onAccountAmount"    />
+        <result property="projectSchedule"    column="projectSchedule"    />
+        <result property="projectSummarize"    column="projectSummarize"    />
+        <result property="prjPlanUrl"    column="prjPlanUrl"    />
+        <result property="prjRenderingUrl"    column="prjRenderingUrl"    />
+        <result property="isDel"    column="isDel"    />
+        <result property="projectStatus"    column="projectStatus"    />
+        <result property="servicePersonnel"    column="servicePersonnel"    />
+        <result property="supervisorPersonnel"    column="supervisorPersonnel"    />
+        <result property="generalContractor"    column="generalContractor"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="weightType"    column="weightType"    />
+        <result property="projectSort"    column="projectSort"    />
+        <result property="progressVisible"    column="progressVisible"    />
+    </resultMap>
+
+    <sql id="selectSurProjectVo">
+        select id, deptId, projectName, projectCode, paretProjectName, paretProjectCode, simpleName, projectType, projiectLevel, projectRegional, projectAddress, projectNature, licenceNumber, projectApproval, projectPerson, projectPhone, longitude, latitude, projectTimeLimit, totalInvestment, floorArea, totalOutputValue, plannedCompletionTime, scheduledStartTime, actualOperatingTime, actualCompletionTime, contractAmount, paidAmount, onAccountAmount, projectSchedule, projectSummarize, prjPlanUrl, prjRenderingUrl, isDel, projectStatus, servicePersonnel, supervisorPersonnel, generalContractor, create_by, create_time, update_by, update_time, remark, weightType, projectSort, progressVisible from sur_project
+    </sql>
+
+    <select id="selectSurProjectList" parameterType="SurProject" resultMap="SurProjectResult">
+        <include refid="selectSurProjectVo"/>
+        <where>  
+            <if test="deptId != null "> and deptId = #{deptId}</if>
+            <if test="projectName != null  and projectName != ''"> and projectName like concat('%', #{projectName}, '%')</if>
+            <if test="projectCode != null  and projectCode != ''"> and projectCode = #{projectCode}</if>
+            <if test="paretProjectName != null  and paretProjectName != ''"> and paretProjectName like concat('%', #{paretProjectName}, '%')</if>
+            <if test="paretProjectCode != null  and paretProjectCode != ''"> and paretProjectCode = #{paretProjectCode}</if>
+            <if test="simpleName != null  and simpleName != ''"> and simpleName like concat('%', #{simpleName}, '%')</if>
+            <if test="projectType != null  and projectType != ''"> and projectType = #{projectType}</if>
+            <if test="projiectLevel != null  and projiectLevel != ''"> and projiectLevel = #{projiectLevel}</if>
+            <if test="projectRegional != null  and projectRegional != ''"> and projectRegional = #{projectRegional}</if>
+            <if test="projectAddress != null  and projectAddress != ''"> and projectAddress = #{projectAddress}</if>
+            <if test="projectNature != null  and projectNature != ''"> and projectNature = #{projectNature}</if>
+            <if test="licenceNumber != null  and licenceNumber != ''"> and licenceNumber = #{licenceNumber}</if>
+            <if test="projectApproval != null  and projectApproval != ''"> and projectApproval = #{projectApproval}</if>
+            <if test="projectPerson != null  and projectPerson != ''"> and projectPerson = #{projectPerson}</if>
+            <if test="projectPhone != null  and projectPhone != ''"> and projectPhone = #{projectPhone}</if>
+            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
+            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
+            <if test="projectTimeLimit != null "> and projectTimeLimit = #{projectTimeLimit}</if>
+            <if test="totalInvestment != null  and totalInvestment != ''"> and totalInvestment = #{totalInvestment}</if>
+            <if test="floorArea != null  and floorArea != ''"> and floorArea = #{floorArea}</if>
+            <if test="totalOutputValue != null  and totalOutputValue != ''"> and totalOutputValue = #{totalOutputValue}</if>
+            <if test="plannedCompletionTime != null  and plannedCompletionTime != ''"> and plannedCompletionTime = #{plannedCompletionTime}</if>
+            <if test="scheduledStartTime != null  and scheduledStartTime != ''"> and scheduledStartTime = #{scheduledStartTime}</if>
+            <if test="actualOperatingTime != null  and actualOperatingTime != ''"> and actualOperatingTime = #{actualOperatingTime}</if>
+            <if test="actualCompletionTime != null  and actualCompletionTime != ''"> and actualCompletionTime = #{actualCompletionTime}</if>
+            <if test="contractAmount != null  and contractAmount != ''"> and contractAmount = #{contractAmount}</if>
+            <if test="paidAmount != null  and paidAmount != ''"> and paidAmount = #{paidAmount}</if>
+            <if test="onAccountAmount != null  and onAccountAmount != ''"> and onAccountAmount = #{onAccountAmount}</if>
+            <if test="projectSchedule != null  and projectSchedule != ''"> and projectSchedule = #{projectSchedule}</if>
+            <if test="projectSummarize != null  and projectSummarize != ''"> and projectSummarize = #{projectSummarize}</if>
+            <if test="prjPlanUrl != null  and prjPlanUrl != ''"> and prjPlanUrl = #{prjPlanUrl}</if>
+            <if test="prjRenderingUrl != null  and prjRenderingUrl != ''"> and prjRenderingUrl = #{prjRenderingUrl}</if>
+            <if test="isDel != null "> and isDel = #{isDel}</if>
+            <if test="projectStatus != null  and projectStatus != ''"> and projectStatus = #{projectStatus}</if>
+            <if test="servicePersonnel != null "> and servicePersonnel = #{servicePersonnel}</if>
+            <if test="supervisorPersonnel != null "> and supervisorPersonnel = #{supervisorPersonnel}</if>
+            <if test="generalContractor != null "> and generalContractor = #{generalContractor}</if>
+            <if test="weightType != null  and weightType != ''"> and weightType = #{weightType}</if>
+            <if test="projectSort != null "> and projectSort = #{projectSort}</if>
+            <if test="progressVisible != null  and progressVisible != ''"> and progressVisible = #{progressVisible}</if>
+        </where>
+    </select>
+    
+    <select id="selectSurProjectById" parameterType="Long" resultMap="SurProjectResult">
+        <include refid="selectSurProjectVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSurProject" parameterType="SurProject" useGeneratedKeys="true" keyProperty="id">
+        insert into sur_project
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">deptId,</if>
+            <if test="projectName != null">projectName,</if>
+            <if test="projectCode != null">projectCode,</if>
+            <if test="paretProjectName != null">paretProjectName,</if>
+            <if test="paretProjectCode != null">paretProjectCode,</if>
+            <if test="simpleName != null">simpleName,</if>
+            <if test="projectType != null">projectType,</if>
+            <if test="projiectLevel != null">projiectLevel,</if>
+            <if test="projectRegional != null">projectRegional,</if>
+            <if test="projectAddress != null">projectAddress,</if>
+            <if test="projectNature != null">projectNature,</if>
+            <if test="licenceNumber != null">licenceNumber,</if>
+            <if test="projectApproval != null">projectApproval,</if>
+            <if test="projectPerson != null">projectPerson,</if>
+            <if test="projectPhone != null">projectPhone,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="projectTimeLimit != null">projectTimeLimit,</if>
+            <if test="totalInvestment != null">totalInvestment,</if>
+            <if test="floorArea != null">floorArea,</if>
+            <if test="totalOutputValue != null">totalOutputValue,</if>
+            <if test="plannedCompletionTime != null">plannedCompletionTime,</if>
+            <if test="scheduledStartTime != null">scheduledStartTime,</if>
+            <if test="actualOperatingTime != null">actualOperatingTime,</if>
+            <if test="actualCompletionTime != null">actualCompletionTime,</if>
+            <if test="contractAmount != null">contractAmount,</if>
+            <if test="paidAmount != null">paidAmount,</if>
+            <if test="onAccountAmount != null">onAccountAmount,</if>
+            <if test="projectSchedule != null">projectSchedule,</if>
+            <if test="projectSummarize != null">projectSummarize,</if>
+            <if test="prjPlanUrl != null">prjPlanUrl,</if>
+            <if test="prjRenderingUrl != null">prjRenderingUrl,</if>
+            <if test="isDel != null">isDel,</if>
+            <if test="projectStatus != null">projectStatus,</if>
+            <if test="servicePersonnel != null">servicePersonnel,</if>
+            <if test="supervisorPersonnel != null">supervisorPersonnel,</if>
+            <if test="generalContractor != null">generalContractor,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="weightType != null">weightType,</if>
+            <if test="projectSort != null">projectSort,</if>
+            <if test="progressVisible != null">progressVisible,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">#{deptId},</if>
+            <if test="projectName != null">#{projectName},</if>
+            <if test="projectCode != null">#{projectCode},</if>
+            <if test="paretProjectName != null">#{paretProjectName},</if>
+            <if test="paretProjectCode != null">#{paretProjectCode},</if>
+            <if test="simpleName != null">#{simpleName},</if>
+            <if test="projectType != null">#{projectType},</if>
+            <if test="projiectLevel != null">#{projiectLevel},</if>
+            <if test="projectRegional != null">#{projectRegional},</if>
+            <if test="projectAddress != null">#{projectAddress},</if>
+            <if test="projectNature != null">#{projectNature},</if>
+            <if test="licenceNumber != null">#{licenceNumber},</if>
+            <if test="projectApproval != null">#{projectApproval},</if>
+            <if test="projectPerson != null">#{projectPerson},</if>
+            <if test="projectPhone != null">#{projectPhone},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="projectTimeLimit != null">#{projectTimeLimit},</if>
+            <if test="totalInvestment != null">#{totalInvestment},</if>
+            <if test="floorArea != null">#{floorArea},</if>
+            <if test="totalOutputValue != null">#{totalOutputValue},</if>
+            <if test="plannedCompletionTime != null">#{plannedCompletionTime},</if>
+            <if test="scheduledStartTime != null">#{scheduledStartTime},</if>
+            <if test="actualOperatingTime != null">#{actualOperatingTime},</if>
+            <if test="actualCompletionTime != null">#{actualCompletionTime},</if>
+            <if test="contractAmount != null">#{contractAmount},</if>
+            <if test="paidAmount != null">#{paidAmount},</if>
+            <if test="onAccountAmount != null">#{onAccountAmount},</if>
+            <if test="projectSchedule != null">#{projectSchedule},</if>
+            <if test="projectSummarize != null">#{projectSummarize},</if>
+            <if test="prjPlanUrl != null">#{prjPlanUrl},</if>
+            <if test="prjRenderingUrl != null">#{prjRenderingUrl},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="projectStatus != null">#{projectStatus},</if>
+            <if test="servicePersonnel != null">#{servicePersonnel},</if>
+            <if test="supervisorPersonnel != null">#{supervisorPersonnel},</if>
+            <if test="generalContractor != null">#{generalContractor},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="weightType != null">#{weightType},</if>
+            <if test="projectSort != null">#{projectSort},</if>
+            <if test="progressVisible != null">#{progressVisible},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSurProject" parameterType="SurProject">
+        update sur_project
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deptId != null">deptId = #{deptId},</if>
+            <if test="projectName != null">projectName = #{projectName},</if>
+            <if test="projectCode != null">projectCode = #{projectCode},</if>
+            <if test="paretProjectName != null">paretProjectName = #{paretProjectName},</if>
+            <if test="paretProjectCode != null">paretProjectCode = #{paretProjectCode},</if>
+            <if test="simpleName != null">simpleName = #{simpleName},</if>
+            <if test="projectType != null">projectType = #{projectType},</if>
+            <if test="projiectLevel != null">projiectLevel = #{projiectLevel},</if>
+            <if test="projectRegional != null">projectRegional = #{projectRegional},</if>
+            <if test="projectAddress != null">projectAddress = #{projectAddress},</if>
+            <if test="projectNature != null">projectNature = #{projectNature},</if>
+            <if test="licenceNumber != null">licenceNumber = #{licenceNumber},</if>
+            <if test="projectApproval != null">projectApproval = #{projectApproval},</if>
+            <if test="projectPerson != null">projectPerson = #{projectPerson},</if>
+            <if test="projectPhone != null">projectPhone = #{projectPhone},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="projectTimeLimit != null">projectTimeLimit = #{projectTimeLimit},</if>
+            <if test="totalInvestment != null">totalInvestment = #{totalInvestment},</if>
+            <if test="floorArea != null">floorArea = #{floorArea},</if>
+            <if test="totalOutputValue != null">totalOutputValue = #{totalOutputValue},</if>
+            <if test="plannedCompletionTime != null">plannedCompletionTime = #{plannedCompletionTime},</if>
+            <if test="scheduledStartTime != null">scheduledStartTime = #{scheduledStartTime},</if>
+            <if test="actualOperatingTime != null">actualOperatingTime = #{actualOperatingTime},</if>
+            <if test="actualCompletionTime != null">actualCompletionTime = #{actualCompletionTime},</if>
+            <if test="contractAmount != null">contractAmount = #{contractAmount},</if>
+            <if test="paidAmount != null">paidAmount = #{paidAmount},</if>
+            <if test="onAccountAmount != null">onAccountAmount = #{onAccountAmount},</if>
+            <if test="projectSchedule != null">projectSchedule = #{projectSchedule},</if>
+            <if test="projectSummarize != null">projectSummarize = #{projectSummarize},</if>
+            <if test="prjPlanUrl != null">prjPlanUrl = #{prjPlanUrl},</if>
+            <if test="prjRenderingUrl != null">prjRenderingUrl = #{prjRenderingUrl},</if>
+            <if test="isDel != null">isDel = #{isDel},</if>
+            <if test="projectStatus != null">projectStatus = #{projectStatus},</if>
+            <if test="servicePersonnel != null">servicePersonnel = #{servicePersonnel},</if>
+            <if test="supervisorPersonnel != null">supervisorPersonnel = #{supervisorPersonnel},</if>
+            <if test="generalContractor != null">generalContractor = #{generalContractor},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="weightType != null">weightType = #{weightType},</if>
+            <if test="projectSort != null">projectSort = #{projectSort},</if>
+            <if test="progressVisible != null">progressVisible = #{progressVisible},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSurProjectById" parameterType="Long">
+        delete from sur_project where id = #{id}
+    </delete>
+
+    <delete id="deleteSurProjectByIds" parameterType="String">
+        delete from sur_project where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-yanzhu/src/main/resources/mapper/system/SysNativeMapper.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.xd.system.mapper.SysNativeMapper">
+    
+    <resultMap type="SysNative" id="SysNativeResult">
+        <result property="id"    column="id"    />
+        <result property="address"    column="address"    />
+        <result property="provinces"    column="provinces"    />
+        <result property="citiy"    column="citiy"    />
+        <result property="areas"    column="areas"    />
+    </resultMap>
+
+    <sql id="selectSysNativeVo">
+        select id, address, provinces, citiy, areas from sys_native
+    </sql>
+
+    <select id="selectSysNativeList" parameterType="SysNative" resultMap="SysNativeResult">
+        <include refid="selectSysNativeVo"/>
+        <where>  
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="provinces != null  and provinces != ''"> and provinces = #{provinces}</if>
+            <if test="citiy != null  and citiy != ''"> and citiy = #{citiy}</if>
+            <if test="areas != null  and areas != ''"> and areas = #{areas}</if>
+        </where>
+    </select>
+    
+    <select id="selectSysNativeById" parameterType="Long" resultMap="SysNativeResult">
+        <include refid="selectSysNativeVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSysNative" parameterType="SysNative">
+        insert into sys_native
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="address != null">address,</if>
+            <if test="provinces != null">provinces,</if>
+            <if test="citiy != null">citiy,</if>
+            <if test="areas != null">areas,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="address != null">#{address},</if>
+            <if test="provinces != null">#{provinces},</if>
+            <if test="citiy != null">#{citiy},</if>
+            <if test="areas != null">#{areas},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysNative" parameterType="SysNative">
+        update sys_native
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="address != null">address = #{address},</if>
+            <if test="provinces != null">provinces = #{provinces},</if>
+            <if test="citiy != null">citiy = #{citiy},</if>
+            <if test="areas != null">areas = #{areas},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysNativeById" parameterType="Long">
+        delete from sys_native where id = #{id}
+    </delete>
+
+    <delete id="deleteSysNativeByIds" parameterType="String">
+        delete from sys_native where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <select id="selectSysNativeListById" parameterType="Long" resultMap="SysNativeResult">
+        SELECT * FROM sys_native WHERE id=#{id}
+    </select>
+</mapper>

velocity.log.1

@@ -0,0 +1,481 @@
+2024-10-25 22:12:02,670 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:02,672 - ResourceManager : found vm/html/edit.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,672 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:02,674 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:02,675 - ResourceManager : found vm/sql/sql.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,294 - ResourceManager : found vm/java/domain.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,296 - ResourceManager : found vm/java/mapper.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,296 - ResourceManager : found vm/java/service.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,297 - ResourceManager : found vm/java/serviceImpl.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,297 - ResourceManager : found vm/java/controller.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,298 - ResourceManager : found vm/xml/mapper.xml.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,300 - ResourceManager : found vm/html/list.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,302 - ResourceManager : found vm/html/add.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,302 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,302 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,302 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,302 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,302 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,302 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,302 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,302 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,303 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,304 - ResourceManager : found vm/html/edit.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,305 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,306 - ResourceManager : found vm/sql/sql.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,334 - ResourceManager : found vm/java/domain.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,335 - ResourceManager : found vm/java/mapper.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,336 - ResourceManager : found vm/java/service.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,337 - ResourceManager : found vm/java/serviceImpl.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,338 - ResourceManager : found vm/java/controller.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,338 - ResourceManager : found vm/xml/mapper.xml.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,341 - ResourceManager : found vm/html/list.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,342 - ResourceManager : found vm/html/add.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,342 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,342 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,342 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,342 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,342 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,342 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,342 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,342 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,342 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,343 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,344 - ResourceManager : found vm/html/edit.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,344 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,345 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,345 - ResourceManager : found vm/sql/sql.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,372 - ResourceManager : found vm/java/domain.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,374 - ResourceManager : found vm/java/mapper.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,374 - ResourceManager : found vm/java/service.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,375 - ResourceManager : found vm/java/serviceImpl.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,376 - ResourceManager : found vm/java/controller.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,376 - ResourceManager : found vm/xml/mapper.xml.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,378 - ResourceManager : found vm/html/list.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,379 - ResourceManager : found vm/html/add.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,380 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,381 - ResourceManager : found vm/html/edit.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,381 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,382 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,382 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,382 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,382 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,382 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,382 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,382 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,382 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,382 - ResourceManager : found vm/sql/sql.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,409 - ResourceManager : found vm/java/domain.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,410 - ResourceManager : found vm/java/mapper.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,411 - ResourceManager : found vm/java/service.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,412 - ResourceManager : found vm/java/serviceImpl.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,412 - ResourceManager : found vm/java/controller.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,413 - ResourceManager : found vm/xml/mapper.xml.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,415 - ResourceManager : found vm/html/list.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,416 - ResourceManager : found vm/html/add.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 10]
+2024-10-25 22:12:23,416 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/add.html.vm[line 41, column 50]
+2024-10-25 22:12:23,417 - ResourceManager : found vm/html/edit.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '!=' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 10]
+2024-10-25 22:12:23,418 - Right side ($treeParentCode) of '==' operation has null value. If it is a reference, it may not be in the context or its toString() returned null. vm/html/edit.html.vm[line 42, column 50]
+2024-10-25 22:12:23,418 - ResourceManager : found vm/sql/sql.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,447 - ResourceManager : found vm/java/domain.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,448 - ResourceManager : found vm/java/mapper.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,448 - ResourceManager : found vm/java/service.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,449 - ResourceManager : found vm/java/serviceImpl.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,450 - ResourceManager : found vm/java/controller.java.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,451 - ResourceManager : found vm/xml/mapper.xml.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,452 - ResourceManager : found vm/html/list.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2024-10-25 22:12:23,454 - ResourceManager : found vm/html/add.html.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader