diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java index 5cda8fcc..1050ab9d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java @@ -202,7 +202,6 @@ public class SurProjectAttendanceData extends BaseEntity @Excel(name = "工人Id") private String workerId; - /** 考勤时间yyyy-MM-dd HH:mm:ss */ @Excel(name = "考勤时间yyyy-MM-dd HH:mm:ss") private String attendanceTime; @@ -227,24 +226,31 @@ public class SurProjectAttendanceData extends BaseEntity @Excel(name = "平台对应分包商ID") private Long vendorId; - /** 设备编号 */ @Excel(name = "设备编号") private String deviceCode; - /** 照片 */ @Excel(name = "照片") private String scanPhoto; - /** */ @Excel(name = "数据是否有效") private Long isDel; - private Long subDeptId; + /** 重要::yanzhu接口接收base64图片 */ + private String scanPhotoBase64; + + public String getScanPhotoBase64() { + return scanPhotoBase64; + } + + public void setScanPhotoBase64(String scanPhotoBase64) { + this.scanPhotoBase64 = scanPhotoBase64; + } + public static SurProjectAttendanceData createFromHuazhu(JSONObject j) { SurProjectAttendanceData d=new SurProjectAttendanceData(); d.vendorsCode="huazhu"; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java index a4ff3f06..3a3ce53e 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java @@ -157,14 +157,25 @@ public class SurProjectAttendanceUser extends BaseEntity @Excel(name = "服务返回的JSON") private String other; - /** */ - @Excel(name = "") + /** 是否有效 */ + @Excel(name = "是否有效") private Long isDel; /** 人员部门类型 */ @Excel(name = "人员部门类型") private String companyTypeId; + /** 重要::yanzhu接口接收base64图片 */ + private String recentPhotoBase64; + + public String getRecentPhotoBase64() { + return recentPhotoBase64; + } + + public void setRecentPhotoBase64(String recentPhotoBase64) { + this.recentPhotoBase64 = recentPhotoBase64; + } + private Date inTime; private Date outTime; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourDataVo.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourDataVo.java index edeac3b3..8d6971e7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourDataVo.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourDataVo.java @@ -25,8 +25,8 @@ public class LabourDataVo extends BaseEntity private String workerId; /** 分包商id */ - @NotNull(message = "分包商ID不能为空") - private Long companyId; + @NotBlank(message = "分包商ID不能为空") + private String companyId; /** 进门还是出门E进，L出 */ /** @@ -66,11 +66,11 @@ public class LabourDataVo extends BaseEntity this.workerId = workerId; } - public Long getCompanyId() { + public String getCompanyId() { return companyId; } - public void setCompanyId(Long companyId) { + public void setCompanyId(String companyId) { this.companyId = companyId; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourGroupVO.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourGroupVO.java index bb811ff7..6dfe77f6 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourGroupVO.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourGroupVO.java @@ -12,8 +12,8 @@ public class LabourGroupVO { private String serverid; /** 分包商id */ - @NotNull(message = "分包商ID不能为空") - private Long companyId; + @NotBlank(message = "分包商ID不能为空") + private String companyId; /** 分包商名称 */ @NotBlank(message = "分包商名称不能为空") @@ -43,11 +43,11 @@ public class LabourGroupVO { this.serverid = serverid; } - public Long getCompanyId() { + public String getCompanyId() { return companyId; } - public void setCompanyId(Long companyId) { + public void setCompanyId(String companyId) { this.companyId = companyId; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java index f085da46..d7e9ce71 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java @@ -74,8 +74,8 @@ public class LabourUserVO { private String enterDate; /** 分包商id */ - @NotNull(message = "分包商ID不能为空") - private Long companyId; + @NotBlank(message = "分包商ID不能为空") + private String companyId; /** 分包商名称 */ @Size(max = 64, message = "分包商名称最大64位") @@ -190,11 +190,11 @@ public class LabourUserVO { this.enterDate = enterDate; } - public Long getCompanyId() { + public String getCompanyId() { return companyId; } - public void setCompanyId(Long companyId) { + public void setCompanyId(String companyId) { this.companyId = companyId; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java index 25626106..a29dcb85 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java @@ -119,9 +119,10 @@ public class AttendanceJgwTask { System.out.println(DateUtil.format(DateTime.now(),"yyyy-MM-dd")); //findAddWorkerByProject(appid,token,prjId,0); //findAttendanceByProject(appid,token,prjId); - findTeamByProjectId(appid,token,prjId); + //findTeamByProjectId(appid,token,prjId); //findProContractorByProjectId(appid,token,prjId); //getJobTypeData(appid,token,"0"); + findDirectlyUnderTeam(appid,token,prjId); } public static HashMap getJobTypeData(String appId,String token,String type){ String path="/webapi/dictInfo/getJobTypeData"; @@ -291,6 +292,95 @@ public class AttendanceJgwTask { } } } + + public static void querySubcontractorByPhone(String appId,String token,String projectId){ + String path="webapi/project/querySubcontractorByPhone"; + String time = System.currentTimeMillis() + ""; + String startId="100"; + String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; + + String tokenSign = Md5Utils.hash(url); + String phone = "18171295380"; + Map params = new HashMap<>(); + params.put("appId",appId); + params.put("timestamp",time); + params.put("tokenSign",tokenSign); + params.put("phone",phone); + url=host+path+"?appId="+appId+"&tokenSign="+tokenSign+"&phone="+phone+"×tamp="+time; + Request request = new Request.Builder() + .url(url) + .post(toFormBody(params)) + .build(); + String data=AttendanceTask.getResult(request); + JSONObject j= JSON.parseObject(data); + JSONObject joData= j.getJSONObject("data"); + JSONArray arr=joData.getJSONArray("teamList"); + if(arr.size()>0){ + for(int i=0;i0){ + for(int i=0;i dataMap) { try{ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java index fe9da14a..18a89f6e 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java @@ -115,6 +115,13 @@ public interface SmzSspProblemmodifyMapper */ public List countByDate(SmzSspProblemmodifyWhere where); + /** + * 查询某天预警数[新&合并结果集] + * @param where startDate 查询的日期 + * @return + */ + public List> countByDateNew(SmzSspProblemmodifyWhere where); + /** * 根据项目统计隐患排查 * @@ -130,8 +137,22 @@ public interface SmzSspProblemmodifyMapper */ public List countByDateRange(SmzSspProblemmodifyWhere where); + /** + * 查询两个日期之间的预警数[新&合并结果集] + * @param where startDate 开始日期 endDate 结束日期 + * @return + */ + public List> countByDateRangeNew(SmzSspProblemmodifyWhere where); + public List groupByInfotypeCheckState(SmzSspProblemmodifyWhere where); + /** + * 分组查询预警提醒 + * @param where + * @return + */ + public List> groupByInfotypeCheckStateNew(SmzSspProblemmodifyWhere where); + public int countTimeout(SmzSspProblemmodifyWhere where); /** diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java index 6de8db79..8751fb85 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java @@ -122,10 +122,31 @@ public interface ISmzSspProblemmodifyService public List countByDate(SmzSspProblemmodifyWhere where); + /** + * 查询某天预警数[新&合并结果集] + * @param where startDate 查询的日期 + * @return + */ + public List> countByDateNew(SmzSspProblemmodifyWhere where); + public List countByDateRange(SmzSspProblemmodifyWhere where); + /** + * 查询两个日期之间的预警数[新&合并结果集] + * @param where startDate 开始日期 endDate 结束日期 + * @return + */ + public List> countByDateRangeNew(SmzSspProblemmodifyWhere where); + public List groupByInfotypeCheckState(SmzSspProblemmodifyWhere where); + /** + * 分组查询预警提醒 + * @param where + * @return + */ + public List> groupByInfotypeCheckStateNew(SmzSspProblemmodifyWhere where); + public Long countTimeout(SmzSspProblemmodifyWhere where); public List selectSmzSspProblemmodifyListAndUnitName(SmzSspProblemmodifyWhere where); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java index de6db163..188b4757 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java @@ -226,16 +226,47 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi return smzSspProblemmodifyMapper.countByDate(where); } + /** + * 查询某天预警数[新&合并结果集] + * @param where startDate 查询的日期 + * @return + */ + @Override + public List> countByDateNew(SmzSspProblemmodifyWhere where) { + List> list = smzSspProblemmodifyMapper.countByDateNew(where); + return list; + } + @Override public List countByDateRange(SmzSspProblemmodifyWhere where) { return smzSspProblemmodifyMapper.countByDateRange(where); } + /** + * 查询两个日期之间的预警数[新&合并结果集] + * @param where startDate 开始日期 endDate 结束日期 + * @return + */ + @Override + public List> countByDateRangeNew(SmzSspProblemmodifyWhere where) { + return smzSspProblemmodifyMapper.countByDateRangeNew(where); + } + @Override public List groupByInfotypeCheckState(SmzSspProblemmodifyWhere where) { return smzSspProblemmodifyMapper.groupByInfotypeCheckState(where); } + /** + * 分组查询预警提醒 + * @param where + * @return + */ + @Override + public List> groupByInfotypeCheckStateNew(SmzSspProblemmodifyWhere where) { + return smzSspProblemmodifyMapper.groupByInfotypeCheckStateNew(where); + } + @Override public Long countTimeout(SmzSspProblemmodifyWhere where) { return (long) smzSspProblemmodifyMapper.countTimeout(where); diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index b0da6f96..367dcbb8 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -431,6 +431,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" COUNT(1) as roleType FROM smz_ssp_problemmodify sp + left join sur_project p on p.id=sp.projectId left join sys_dict_data sd on sd.dict_value=sp.danger_type and sd.dict_type = 'ssp_aqyhlx' and sd.dict_type = 'ssp_zlyhlx' @@ -440,7 +441,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE(sp.createtime) >= DATE(#{startDate}) and DATE(sp.createtime) <= DATE(#{endDate}) and sp.projectId=#{projectId} - AND sp.deptid = #{deptId} + AND p.deptid = #{deptId} and sp.projectId in @@ -551,7 +552,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE(createTime)=Date(#{startDate}) GROUP BY infotype + + + + + + +