bug修复
This commit is contained in:
parent
647356cdc1
commit
35554aa6cc
@ -274,4 +274,14 @@ public class HiddenDangerInspectRecordController {
|
||||
public Result<List<HiddenDangerInspectionStatistics>> selectHiddenDangerStateTrend(@RequestBody Map<String, Object> map) {
|
||||
return Result.success(hiddenDangerInspectRecordService.selectHiddenDangerStateTrend(map));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "按问题状态统计问题趋势（按周算）", notes = "按问题状态统计问题趋势（按周算）", httpMethod = "POST")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
|
||||
@ApiImplicitParam(name = "offsetWeek", value = "查询几周的数量(不填默认5周)", paramType = "query", dataType = "Integer"),
|
||||
})
|
||||
@PostMapping(value = "/selectHiddenDangerStateTrendByWeek")
|
||||
public Result<List<HiddenDangerInspectionStatistics>> selectHiddenDangerStateTrendByWeek(@RequestBody Map<String, Object> map) {
|
||||
return Result.success(hiddenDangerInspectRecordService.selectHiddenDangerStateTrendByWeek(map));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.zhgd.xmgl.modules.dangerous.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
@ -16,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
@Mapper
|
||||
public interface HiddenDangerInspectionStatisticsMapper extends BaseMapper<HiddenDangerInspectionStatistics> {
|
||||
|
||||
List<HiddenDangerInspectionStatistics> selectHiddenDangerStateTrendByWeek(Map<String, Object> map);
|
||||
}
|
||||
|
||||
@ -2,4 +2,18 @@
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.dangerous.mapper.HiddenDangerInspectionStatisticsMapper">
|
||||
|
||||
<select id="selectHiddenDangerStateTrendByWeek"
|
||||
resultType="com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectionStatistics">
|
||||
SELECT
|
||||
hd.id,
|
||||
date_add( date_sub(hd.create_time,interval dayofweek(hd.create_time)-2 day), INTERVAL 7 DAY ) create_time,
|
||||
sum(hd.increase_num) increase_num,
|
||||
sum(hd.solve_num) solve_num,
|
||||
sum(hd.un_resolve_num) un_resolve_num,
|
||||
hd.project_sn
|
||||
FROM `hidden_danger_inspection_statistics` hd
|
||||
GROUP BY YEARWEEK(hd.create_time)
|
||||
HAVING hd.project_sn = #{projectSn}
|
||||
ORDER BY hd.create_time DESC LIMIT #{offsetWeek}
|
||||
</select>
|
||||
</mapper>
|
||||
@ -70,4 +70,6 @@ public interface IHiddenDangerInspectRecordService extends IService<HiddenDanger
|
||||
List<EntityMap> selectHiddenDangerTypeRatio(Map<String, Object> map);
|
||||
|
||||
List<HiddenDangerInspectionStatistics> selectHiddenDangerStateTrend(Map<String, Object> map);
|
||||
|
||||
List<HiddenDangerInspectionStatistics> selectHiddenDangerStateTrendByWeek(Map<String, Object> map);
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package com.zhgd.xmgl.modules.dangerous.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.text.CharSequenceUtil;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
@ -430,12 +429,26 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
||||
offsetDay = -offsetDay;
|
||||
}
|
||||
return hiddenDangerInspectionStatisticsMapper.selectList(Wrappers.<HiddenDangerInspectionStatistics>
|
||||
lambdaQuery().eq(HiddenDangerInspectionStatistics::getProjectSn, MapUtils.getString(map, "projectSn"))
|
||||
lambdaQuery().eq(HiddenDangerInspectionStatistics::getProjectSn, MapUtils.getString(map, "projectSn"))
|
||||
.between(HiddenDangerInspectionStatistics::getCreateTime,
|
||||
DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), offsetDay)),
|
||||
DateUtil.endOfDay(DateUtil.offsetDay(new Date(), -1))));
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<HiddenDangerInspectionStatistics> selectHiddenDangerStateTrendByWeek(Map<String, Object> map) {
|
||||
Integer offsetWeek = MapUtils.getInteger(map, "offsetWeek");
|
||||
if (offsetWeek == null || offsetWeek <= 0) {
|
||||
offsetWeek = 5;
|
||||
}
|
||||
map.put("offsetWeek", offsetWeek + 1);
|
||||
List<HiddenDangerInspectionStatistics> statisticsList = hiddenDangerInspectionStatisticsMapper.selectHiddenDangerStateTrendByWeek(map);
|
||||
//删除最新的没有完全统计的一周的数据，一条数据
|
||||
statisticsList.remove(0);
|
||||
Collections.sort(statisticsList,(o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()));
|
||||
return statisticsList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置全部占比
|
||||
*
|
||||
|
||||
@ -832,7 +832,12 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
|
||||
int projectAlarmNum = 0;
|
||||
int projectPreAlarmNum = 0;
|
||||
for (ProjectTodayAlarmNum num : list) {
|
||||
projectPreAlarmNum += num.getTodayAlarmNum();
|
||||
if (!Objects.equals(num.getTodayPreAlarmNum(),0)) {
|
||||
projectPreAlarmNum++;
|
||||
}
|
||||
if (!Objects.equals(num.getTodayAlarmNum(),0)) {
|
||||
projectAlarmNum++;
|
||||
}
|
||||
}
|
||||
vo.setProjectAlarmNum(projectAlarmNum);
|
||||
vo.setProjectPreAlarmNum(projectPreAlarmNum);
|
||||
|
||||
@ -3,21 +3,29 @@
|
||||
<mapper namespace="com.zhgd.xmgl.modules.worker.mapper.WorkerAttendanceMapper">
|
||||
|
||||
<select id="viewDayAttendanceList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
|
||||
SELECT a.attendance_status,a.attendance_type,a.card_type,a.create_time,a.passageway_name,
|
||||
a.pass_type,a.project_sn,a.temperature,
|
||||
IF(a.image_url IS NOT NULL,a.image_url,b.id_card_big_photo_url) image_url,
|
||||
b.worker_name,b.id_card
|
||||
from worker_attendance a LEFT JOIN worker_info b ON a.person_sn=b.person_sn
|
||||
WHERE a.person_sn=#{personSn} AND a.is_statistics=0
|
||||
AND a.create_time >=CONCAT(DATE_FORMAT(#{queryTime},"%Y-%m-%d"),' 00:00:00')
|
||||
and a.create_time<=CONCAT(DATE_FORMAT(#{queryTime},"%Y-%m-%d"),' 23:59:59')
|
||||
SELECT a.attendance_status,
|
||||
a.attendance_type,
|
||||
a.card_type,
|
||||
a.create_time,
|
||||
a.passageway_name,
|
||||
a.pass_type,
|
||||
a.project_sn,
|
||||
a.temperature,
|
||||
IF(a.image_url IS NOT NULL, a.image_url, b.id_card_big_photo_url) image_url,
|
||||
b.worker_name,
|
||||
b.id_card
|
||||
from worker_attendance a
|
||||
LEFT JOIN worker_info b ON a.person_sn = b.person_sn
|
||||
WHERE a.person_sn = #{personSn}
|
||||
AND a.is_statistics = 0
|
||||
AND a.create_time >= CONCAT(DATE_FORMAT(#{queryTime}, "%Y-%m-%d"), ' 00:00:00')
|
||||
and a.create_time <= CONCAT(DATE_FORMAT(#{queryTime}, "%Y-%m-%d"), ' 23:59:59')
|
||||
</select>
|
||||
<select id="selectOneWorkerAttendance" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
|
||||
SELECT pass_type, create_time
|
||||
FROM worker_attendance
|
||||
WHERE
|
||||
person_sn=#{personSn}
|
||||
AND is_statistics=0
|
||||
WHERE person_sn = #{personSn}
|
||||
AND is_statistics = 0
|
||||
<![CDATA[
|
||||
AND create_time >= #{startCreateTime}
|
||||
AND create_time <= #{endCreateTime}
|
||||
@ -26,8 +34,8 @@
|
||||
</select>
|
||||
<select id="selectWorkerAttendancePage" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
|
||||
SELECT a.*,
|
||||
IF(a.image_url IS NOT NULL,a.image_url,b.id_card_big_photo_url) image_url,code_state,
|
||||
b.worker_name,b.id_card,c.team_name,d.department_name,b.field_acquisition_url
|
||||
IF(a.image_url IS NOT NULL,a.image_url,b.id_card_big_photo_url) image_url,code_state,
|
||||
b.worker_name,b.id_card,c.team_name,d.department_name,b.field_acquisition_url
|
||||
from worker_attendance a LEFT JOIN worker_info b ON a.person_sn=b.person_sn
|
||||
LEFT JOIN team_info c ON b.team_id=c.id
|
||||
LEFT JOIN department_info d ON b.department_id=d.id
|
||||
@ -57,7 +65,7 @@
|
||||
and b.enterprise_id=#{param.enterpriseId}
|
||||
</if>
|
||||
<if test="param.userEnterpriseId!=null and param.userEnterpriseId!=''">
|
||||
and FIND_IN_SET(b.enterprise_id,#{param.userEnterpriseId})
|
||||
and FIND_IN_SET(b.enterprise_id,#{param.userEnterpriseId})
|
||||
</if>
|
||||
<if test="param.isStatistics!=null and param.isStatistics!='' or param.isStatistics=='0'.toString()">
|
||||
and a.is_statistics=#{param.isStatistics}
|
||||
@ -66,53 +74,54 @@
|
||||
</select>
|
||||
<select id="selectWorkerAttendanceNewestList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
|
||||
SELECT a.*,
|
||||
IF(a.image_url IS NOT NULL,a.image_url,b.id_card_big_photo_url) image_url,
|
||||
b.worker_name,b.id_card,c.team_name,d.department_name,b.field_acquisition_url
|
||||
IF(a.image_url IS NOT NULL,a.image_url,b.id_card_big_photo_url) image_url,
|
||||
b.worker_name,b.id_card,c.team_name,d.department_name,b.field_acquisition_url
|
||||
from (select * from worker_attendance where project_sn=#{projectSn}
|
||||
order by create_time desc
|
||||
LIMIT 30) a
|
||||
INNER JOIN worker_info b ON (a.person_sn=b.person_sn and a.project_sn=b.project_sn)
|
||||
LEFT JOIN team_info c ON b.team_id=c.id
|
||||
LEFT JOIN department_info d ON b.department_id=d.id
|
||||
LEFT JOIN team_info c ON b.team_id=c.id
|
||||
LEFT JOIN department_info d ON b.department_id=d.id
|
||||
WHERE b.project_sn=#{projectSn}
|
||||
<if test="userEnterpriseId!=null and userEnterpriseId!=''">
|
||||
and FIND_IN_SET(b.enterprise_id,#{userEnterpriseId})
|
||||
and FIND_IN_SET(b.enterprise_id,#{userEnterpriseId})
|
||||
</if>
|
||||
|
||||
</select>
|
||||
<select id="getWorkerCurrentTotalCount" resultType="java.util.Map" parameterType="java.util.Map">
|
||||
SELECT
|
||||
COUNT(1) totalPerson,
|
||||
IFNULL(sum((CASE WHEN person_type=1 then 1 ELSE 0 END)),0) lwPersonTotal,
|
||||
IFNULL(sum((CASE WHEN person_type=2 then 1 ELSE 0 END)),0) glPersonTotal,
|
||||
IFNULL(sum((CASE WHEN person_type=3 then 1 ELSE 0 END)),0) lsPersonTotal
|
||||
COUNT(1) totalPerson,
|
||||
IFNULL(sum((CASE WHEN person_type=1 then 1 ELSE 0 END)),0) lwPersonTotal,
|
||||
IFNULL(sum((CASE WHEN person_type=2 then 1 ELSE 0 END)),0) glPersonTotal,
|
||||
IFNULL(sum((CASE WHEN person_type=3 then 1 ELSE 0 END)),0) lsPersonTotal
|
||||
FROM(SELECT w1.id,w1.person_type,w1.person_sn
|
||||
from worker_info w1 INNER JOIN project a ON w1.project_sn=a.project_sn
|
||||
INNER JOIN company cp ON a.company_sn=cp.company_sn
|
||||
INNER JOIN company b ON cp.parent_id=b.company_id
|
||||
INNER JOIN worker_attendance p ON w1.person_sn=p.person_sn
|
||||
Left JOIN company f ON b.parent_id=f.company_id
|
||||
WHERE p.create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00') and w1.inService_type=1 AND p.is_statistics=0
|
||||
<if test="projectName!=null and projectName!=''">
|
||||
and a.project_name like CONCAT(CONCAT('%',#{projectName}),'%')
|
||||
</if>
|
||||
<if test="companyType == '1'.toString()">
|
||||
and f.headquarters_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '2'.toString()">
|
||||
and f.company_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '3'.toString()">
|
||||
and b.company_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '4'.toString()">
|
||||
and w1.project_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '5'.toString()">
|
||||
and cp.company_sn=#{sn}
|
||||
</if>
|
||||
GROUP BY w1.id
|
||||
) tp
|
||||
from worker_info w1 INNER JOIN project a ON w1.project_sn=a.project_sn
|
||||
INNER JOIN company cp ON a.company_sn=cp.company_sn
|
||||
INNER JOIN company b ON cp.parent_id=b.company_id
|
||||
INNER JOIN worker_attendance p ON w1.person_sn=p.person_sn
|
||||
Left JOIN company f ON b.parent_id=f.company_id
|
||||
WHERE p.create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00') and w1.inService_type=1 AND
|
||||
p.is_statistics=0
|
||||
<if test="projectName!=null and projectName!=''">
|
||||
and a.project_name like CONCAT(CONCAT('%',#{projectName}),'%')
|
||||
</if>
|
||||
<if test="companyType == '1'.toString()">
|
||||
and f.headquarters_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '2'.toString()">
|
||||
and f.company_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '3'.toString()">
|
||||
and b.company_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '4'.toString()">
|
||||
and w1.project_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '5'.toString()">
|
||||
and cp.company_sn=#{sn}
|
||||
</if>
|
||||
GROUP BY w1.id
|
||||
) tp
|
||||
|
||||
</select>
|
||||
|
||||
@ -124,44 +133,45 @@
|
||||
INNER JOIN worker_attendance p ON w1.person_sn=p.person_sn
|
||||
Left JOIN company f ON b.parent_id=f.company_id
|
||||
where p.is_statistics=0
|
||||
<if test="dayType==1">
|
||||
and p.create_time>=DATE_ADD(NOW(),INTERVAL -6 DAY)
|
||||
</if>
|
||||
<if test="dayType==2">
|
||||
and p.create_time>=DATE_ADD(NOW(),INTERVAL -14 DAY)
|
||||
</if>
|
||||
<if test="dayType==3">
|
||||
and p.create_time>=DATE_ADD(NOW(),INTERVAL -1 MONTH )
|
||||
</if>
|
||||
<if test="projectName!=null and projectName!=''">
|
||||
and a.project_name like CONCAT(CONCAT('%',#{projectName}),'%')
|
||||
</if>
|
||||
<if test="companyType == '1'.toString()">
|
||||
and f.headquarters_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '2'.toString()">
|
||||
and f.company_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '3'.toString()">
|
||||
and b.company_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '4'.toString()">
|
||||
and w1.project_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '5'.toString()">
|
||||
and cp.company_sn=#{sn}
|
||||
</if>
|
||||
<if test="dayType==1">
|
||||
and p.create_time>=DATE_ADD(NOW(),INTERVAL -6 DAY)
|
||||
</if>
|
||||
<if test="dayType==2">
|
||||
and p.create_time>=DATE_ADD(NOW(),INTERVAL -14 DAY)
|
||||
</if>
|
||||
<if test="dayType==3">
|
||||
and p.create_time>=DATE_ADD(NOW(),INTERVAL -1 MONTH )
|
||||
</if>
|
||||
<if test="projectName!=null and projectName!=''">
|
||||
and a.project_name like CONCAT(CONCAT('%',#{projectName}),'%')
|
||||
</if>
|
||||
<if test="companyType == '1'.toString()">
|
||||
and f.headquarters_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '2'.toString()">
|
||||
and f.company_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '3'.toString()">
|
||||
and b.company_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '4'.toString()">
|
||||
and w1.project_sn=#{sn}
|
||||
</if>
|
||||
<if test="companyType == '5'.toString()">
|
||||
and cp.company_sn=#{sn}
|
||||
</if>
|
||||
GROUP BY DATE_FORMAT(p.create_time,"%Y-%m-%d")
|
||||
order by DATE_FORMAT(p.create_time,"%Y-%m-%d")
|
||||
|
||||
</select>
|
||||
<select id="selectExportExcelWorkerAttendanceList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap" parameterType="map">
|
||||
<select id="selectExportExcelWorkerAttendanceList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap"
|
||||
parameterType="map">
|
||||
SELECT p.*,
|
||||
w1.worker_name,w1.id_card,en.enterprise_name,c.team_name,d.department_name,w1.person_type,w1.inService_type
|
||||
w1.worker_name,w1.id_card,en.enterprise_name,c.team_name,d.department_name,w1.person_type,w1.inService_type
|
||||
from worker_info w1 INNER JOIN worker_attendance p ON w1.person_sn=p.person_sn
|
||||
LEFT JOIN enterprise_info en ON en.id=w1.enterprise_id
|
||||
LEFT JOIN team_info c ON w1.team_id=c.id
|
||||
LEFT JOIN department_info d ON w1.department_id=d.id
|
||||
LEFT JOIN enterprise_info en ON en.id=w1.enterprise_id
|
||||
LEFT JOIN team_info c ON w1.team_id=c.id
|
||||
LEFT JOIN department_info d ON w1.department_id=d.id
|
||||
where w1.project_sn=#{projectSn} and w1.inService_type=#{inserviceType}
|
||||
<if test="personType!=null and personType!=''">
|
||||
and w1.person_type=#{personType}
|
||||
@ -170,7 +180,7 @@
|
||||
and w1.enterprise_id=#{enterpriseId}
|
||||
</if>
|
||||
<if test="userEnterpriseId!=null and userEnterpriseId!=''">
|
||||
and FIND_IN_SET(w1.enterprise_id,#{userEnterpriseId})
|
||||
and FIND_IN_SET(w1.enterprise_id,#{userEnterpriseId})
|
||||
</if>
|
||||
<if test="workerName!=null and workerName!=''">
|
||||
and w1.worker_name like CONCAT(CONCAT('%',#{workerName}),'%')
|
||||
@ -196,38 +206,47 @@
|
||||
</select>
|
||||
<select id="getProjectAttendancePersonToltal" resultType="java.lang.Integer" parameterType="map">
|
||||
SELECT COUNT(DISTINCT w1.person_sn)
|
||||
from worker_info w1 INNER JOIN worker_attendance p ON w1.person_sn=p.person_sn
|
||||
WHERE p.create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00') and w1.inService_type=1
|
||||
and w1.project_sn=#{sn}
|
||||
AND p.is_statistics=0
|
||||
from worker_info w1
|
||||
INNER JOIN worker_attendance p ON w1.person_sn = p.person_sn
|
||||
WHERE p.create_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
|
||||
and w1.inService_type = 1
|
||||
and w1.project_sn = #{sn}
|
||||
AND p.is_statistics = 0
|
||||
</select>
|
||||
|
||||
<select id="selectWorkerAttendanceListByDev" resultType="com.zhgd.jeecg.common.mybatis.EntityMap" parameterType="map">
|
||||
<select id="selectWorkerAttendanceListByDev" resultType="com.zhgd.jeecg.common.mybatis.EntityMap"
|
||||
parameterType="map">
|
||||
SELECT a.*,
|
||||
IF(a.image_url IS NOT NULL,a.image_url,b.id_card_big_photo_url) image_url,
|
||||
b.worker_name,b.id_card,c.team_name,d.department_name,b.field_acquisition_url
|
||||
from worker_attendance a LEFT JOIN worker_info b ON a.person_sn=b.person_sn
|
||||
LEFT JOIN team_info c ON b.team_id=c.id
|
||||
LEFT JOIN department_info d ON b.department_id=d.id
|
||||
WHERE a.project_sn=#{projectSn} and a.dev_sn=#{devSn}
|
||||
and a.create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00') and b.inService_type=1
|
||||
order by a.create_time desc
|
||||
LIMIT 10
|
||||
IF(a.image_url IS NOT NULL, a.image_url, b.id_card_big_photo_url) image_url,
|
||||
b.worker_name,
|
||||
b.id_card,
|
||||
c.team_name,
|
||||
d.department_name,
|
||||
b.field_acquisition_url
|
||||
from worker_attendance a
|
||||
LEFT JOIN worker_info b ON a.person_sn = b.person_sn
|
||||
LEFT JOIN team_info c ON b.team_id = c.id
|
||||
LEFT JOIN department_info d ON b.department_id = d.id
|
||||
WHERE a.project_sn = #{projectSn}
|
||||
and a.dev_sn = #{devSn}
|
||||
and a.create_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
|
||||
and b.inService_type = 1
|
||||
order by a.create_time desc LIMIT 10
|
||||
</select>
|
||||
<select id="selectWorkerAttendanceCountByDev" resultType="java.util.Map" parameterType="map">
|
||||
select
|
||||
IFNULL(sum((CASE WHEN pass_type=1 then 1 ELSE 0 END)),0) inTotalNum,
|
||||
IFNULL(sum((CASE WHEN pass_type=2 then 1 ELSE 0 END)),0) outTotalNum
|
||||
select IFNULL(sum((CASE WHEN pass_type = 1 then 1 ELSE 0 END)), 0) inTotalNum,
|
||||
IFNULL(sum((CASE WHEN pass_type = 2 then 1 ELSE 0 END)), 0) outTotalNum
|
||||
from worker_attendance
|
||||
where project_sn=#{projectSn} and dev_sn=#{devSn}
|
||||
AND is_statistics=0
|
||||
and create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00')
|
||||
where project_sn = #{projectSn}
|
||||
and dev_sn = #{devSn}
|
||||
AND is_statistics = 0
|
||||
and create_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
|
||||
</select>
|
||||
<select id="getWorkerAttendanceCountDay" resultType="java.lang.Integer" parameterType="map">
|
||||
SELECT COUNT(DISTINCT DATE_FORMAT(create_time,"%Y-%m-%d"))
|
||||
SELECT COUNT(DISTINCT DATE_FORMAT(create_time, "%Y-%m-%d"))
|
||||
from worker_attendance
|
||||
where person_sn=#{personSn}
|
||||
AND is_statistics=0
|
||||
where person_sn = #{personSn}
|
||||
AND is_statistics = 0
|
||||
|
||||
</select>
|
||||
<select id="getWorkerYesterdayTotalCount" resultType="java.util.Map">
|
||||
@ -268,18 +287,24 @@
|
||||
|
||||
</select>
|
||||
<select id="getWorkerAttendanceMinTime" resultType="java.lang.String">
|
||||
SELECT MIN(a.create_time)
|
||||
from worker_attendance a INNER JOIN worker_info b ON a.person_sn=b.person_sn
|
||||
WHERE b.id=#{workerId} AND a.pass_type=1 AND a.is_statistics=0
|
||||
AND a.create_time >=CONCAT(DATE_FORMAT(NOW(),"%Y-%m-%d"),' 00:00:00')
|
||||
and a.create_time<=CONCAT(DATE_FORMAT(NOW(),"%Y-%m-%d"),' 23:59:59')
|
||||
SELECT MIN(a.create_time)
|
||||
from worker_attendance a
|
||||
INNER JOIN worker_info b ON a.person_sn = b.person_sn
|
||||
WHERE b.id = #{workerId}
|
||||
AND a.pass_type = 1
|
||||
AND a.is_statistics = 0
|
||||
AND a.create_time >= CONCAT(DATE_FORMAT(NOW(), "%Y-%m-%d"), ' 00:00:00')
|
||||
and a.create_time <= CONCAT(DATE_FORMAT(NOW(), "%Y-%m-%d"), ' 23:59:59')
|
||||
</select>
|
||||
<select id="getWorkerAttendanceMaxTime" resultType="java.lang.String">
|
||||
SELECT max(a.create_time)
|
||||
from worker_attendance a INNER JOIN worker_info b ON a.person_sn=b.person_sn
|
||||
WHERE b.id=#{workerId} AND a.pass_type=2 AND a.is_statistics is null
|
||||
AND a.create_time >=CONCAT(DATE_FORMAT(NOW(),"%Y-%m-%d"),' 00:00:00')
|
||||
and a.create_time<=CONCAT(DATE_FORMAT(NOW(),"%Y-%m-%d"),' 23:59:59')
|
||||
SELECT max(a.create_time)
|
||||
from worker_attendance a
|
||||
INNER JOIN worker_info b ON a.person_sn = b.person_sn
|
||||
WHERE b.id = #{workerId}
|
||||
AND a.pass_type = 2
|
||||
AND a.is_statistics is null
|
||||
AND a.create_time >= CONCAT(DATE_FORMAT(NOW(), "%Y-%m-%d"), ' 00:00:00')
|
||||
and a.create_time <= CONCAT(DATE_FORMAT(NOW(), "%Y-%m-%d"), ' 23:59:59')
|
||||
</select>
|
||||
<select id="selectAttendancePersonTotalCount" resultType="java.util.Map">
|
||||
SELECT DATE_FORMAT(a.create_time,"%Y-%m-%d") dayTitle,count(DISTINCT a.person_sn) num
|
||||
@ -298,13 +323,14 @@
|
||||
and w1.enterprise_id=#{enterpriseId}
|
||||
</if>
|
||||
<if test="userEnterpriseId!=null and userEnterpriseId!=''">
|
||||
and FIND_IN_SET(w1.enterprise_id,#{userEnterpriseId})
|
||||
and FIND_IN_SET(w1.enterprise_id,#{userEnterpriseId})
|
||||
</if>
|
||||
GROUP BY DATE_FORMAT(a.create_time,"%Y-%m-%d")
|
||||
order by DATE_FORMAT(a.create_time,"%Y-%m-%d")
|
||||
</select>
|
||||
<select id="selectTeamAttendanceTotalCount" resultType="java.util.Map">
|
||||
select t.team_name `name`,IFNULL(tp.num,0) yesterdayNum,IFNULL(tp2.num,0) todayNum,t.enterprise_id enterpriseId,en.enterprise_name enterpriseName
|
||||
select t.team_name `name`,IFNULL(tp.num,0) yesterdayNum,IFNULL(tp2.num,0) todayNum,t.enterprise_id
|
||||
enterpriseId,en.enterprise_name enterpriseName
|
||||
from team_info t
|
||||
LEFT JOIN enterprise_info en ON t.enterprise_id=en.id
|
||||
LEFT JOIN
|
||||
@ -329,22 +355,23 @@
|
||||
GROUP BY w1.team_id ) tp2 ON t.id=tp2.team_id
|
||||
WHERE t.project_sn=#{projectSn}
|
||||
<if test="userEnterpriseId!=null and userEnterpriseId!=''">
|
||||
and FIND_IN_SET(t.enterprise_id,#{userEnterpriseId})
|
||||
and FIND_IN_SET(t.enterprise_id,#{userEnterpriseId})
|
||||
</if>
|
||||
ORDER BY t.enterprise_id
|
||||
</select>
|
||||
<select id="selectDepartmentAttendanceTotalCount"
|
||||
resultType="java.util.Map">
|
||||
select d.department_name `name`,IFNULL(p1.num,0) yesterdayNum,IFNULL(p2.num,0) todayNum,d.enterprise_id enterpriseId,en.enterprise_name enterpriseName
|
||||
select d.department_name `name`,IFNULL(p1.num,0) yesterdayNum,IFNULL(p2.num,0) todayNum,d.enterprise_id
|
||||
enterpriseId,en.enterprise_name enterpriseName
|
||||
from department_info d
|
||||
LEFT JOIN enterprise_info en ON d.enterprise_id=en.id
|
||||
LEFT JOIN
|
||||
LEFT JOIN enterprise_info en ON d.enterprise_id=en.id
|
||||
LEFT JOIN
|
||||
(SELECT w1.department_id,COUNT(DISTINCT w1.person_sn) num
|
||||
from worker_info w1
|
||||
INNER JOIN worker_attendance p ON w1.person_sn=p.person_sn
|
||||
WHERE p.create_time>=CONCAT(DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY),'%Y-%m-%d'),' 00:00:00')
|
||||
and p.create_time <=CONCAT(DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -1 DAY),'%Y-%m-%d'),' 23:59:59')
|
||||
and w1.inService_type=1 and w1.person_type=2 AND p.is_statistics is null
|
||||
and w1.inService_type=1 and w1.person_type=2 AND p.is_statistics is null
|
||||
AND w1.project_sn=#{projectSn}
|
||||
GROUP BY w1.department_id
|
||||
) p1 ON d.id=p1.department_id
|
||||
@ -359,7 +386,7 @@
|
||||
GROUP BY w1.department_id ) p2 ON d.id=p2.department_id
|
||||
WHERE d.project_sn=#{projectSn}
|
||||
<if test="userEnterpriseId!=null and userEnterpriseId!=''">
|
||||
and FIND_IN_SET(d.enterprise_id,#{userEnterpriseId})
|
||||
and FIND_IN_SET(d.enterprise_id,#{userEnterpriseId})
|
||||
</if>
|
||||
ORDER BY d.enterprise_id
|
||||
</select>
|
||||
@ -374,7 +401,7 @@
|
||||
LEFT JOIN enterprise_info en ON en.id=b.enterprise_id
|
||||
WHERE a.project_sn=#{projectSn}
|
||||
<if test="userEnterpriseId!=null and userEnterpriseId!=''">
|
||||
and FIND_IN_SET(b.enterprise_id,#{userEnterpriseId})
|
||||
and FIND_IN_SET(b.enterprise_id,#{userEnterpriseId})
|
||||
</if>
|
||||
<if test="passType!=null and passType!=''">
|
||||
and a.pass_type=#{passType}
|
||||
@ -390,70 +417,81 @@
|
||||
</select>
|
||||
<select id="selectWorkerAttendanceListByCarNumber" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
|
||||
SELECT a.*,
|
||||
IF(a.image_url IS NOT NULL,a.image_url,b.id_card_big_photo_url) image_url,
|
||||
b.worker_name,b.id_card,c.team_name,d.department_name,b.field_acquisition_url
|
||||
from worker_attendance a LEFT JOIN worker_info b ON a.person_sn=b.person_sn
|
||||
LEFT JOIN team_info c ON b.team_id=c.id
|
||||
LEFT JOIN department_info d ON b.department_id=d.id
|
||||
WHERE a.project_sn=#{projectSn} and a.car_number=#{carNumber}
|
||||
and a.create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00') and b.inService_type=1
|
||||
order by a.create_time desc
|
||||
LIMIT 10
|
||||
IF(a.image_url IS NOT NULL, a.image_url, b.id_card_big_photo_url) image_url,
|
||||
b.worker_name,
|
||||
b.id_card,
|
||||
c.team_name,
|
||||
d.department_name,
|
||||
b.field_acquisition_url
|
||||
from worker_attendance a
|
||||
LEFT JOIN worker_info b ON a.person_sn = b.person_sn
|
||||
LEFT JOIN team_info c ON b.team_id = c.id
|
||||
LEFT JOIN department_info d ON b.department_id = d.id
|
||||
WHERE a.project_sn = #{projectSn}
|
||||
and a.car_number = #{carNumber}
|
||||
and a.create_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
|
||||
and b.inService_type = 1
|
||||
order by a.create_time desc LIMIT 10
|
||||
</select>
|
||||
<select id="selectManagerAttendanceDayCount" resultType="java.util.Map">
|
||||
SELECT
|
||||
IFNULL(SUM((case when dictionary_name='管理工种-监理' then 1 else 0 end )),0) supervisorDayNum,
|
||||
IFNULL(SUM((case when dictionary_name='理工种-项目经理' then 1 else 0 end )),0) projectManagerDayNum
|
||||
SELECT IFNULL(SUM((case when dictionary_name = '管理工种-监理' then 1 else 0 end)), 0) supervisorDayNum,
|
||||
IFNULL(SUM((case when dictionary_name = '理工种-项目经理' then 1 else 0 end)), 0) projectManagerDayNum
|
||||
from (
|
||||
SELECT a.job_type,d.dictionary_name,DATE_FORMAT(b.create_time,"%Y-%m-%d") day_title
|
||||
from worker_info a INNER JOIN worker_attendance b ON a.person_sn=b.person_sn
|
||||
INNER JOIN dictionaries_record d ON a.job_type=d.id
|
||||
WHERE b.create_time>=CONCAT(DATE_FORMAT(NOW(),'%Y-%m'),'-01 00:00:00')
|
||||
and a.project_sn=#{projectSn}
|
||||
and d.dictionary_name IN ('管理工种-监理','管理工种-项目经理')
|
||||
GROUP BY a.job_type,day_title
|
||||
SELECT a.job_type, d.dictionary_name, DATE_FORMAT(b.create_time, "%Y-%m-%d") day_title
|
||||
from worker_info a
|
||||
INNER JOIN worker_attendance b ON a.person_sn = b.person_sn
|
||||
INNER JOIN dictionaries_record d ON a.job_type = d.id
|
||||
WHERE b.create_time >= CONCAT(DATE_FORMAT(NOW(), '%Y-%m'), '-01 00:00:00')
|
||||
and a.project_sn = #{projectSn}
|
||||
and d.dictionary_name IN ('管理工种-监理', '管理工种-项目经理')
|
||||
GROUP BY a.job_type, day_title
|
||||
) tp
|
||||
</select>
|
||||
|
||||
<select id="selectUfaceDevWorkerAttendanceCount" resultType="java.util.Map" parameterType="map">
|
||||
select dev_sn devSn,
|
||||
IFNULL(sum((CASE WHEN pass_type=1 then 1 ELSE 0 END)),0) inTotalNum,
|
||||
IFNULL(sum((CASE WHEN pass_type=2 then 1 ELSE 0 END)),0) outTotalNum
|
||||
IFNULL(sum((CASE WHEN pass_type=1 then 1 ELSE 0 END)),0) inTotalNum,
|
||||
IFNULL(sum((CASE WHEN pass_type=2 then 1 ELSE 0 END)),0) outTotalNum
|
||||
from worker_attendance
|
||||
where project_sn=#{projectSn} and dev_sn=#{devSn}
|
||||
AND is_statistics=0
|
||||
and create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00')
|
||||
GROUP BY dev_sn
|
||||
where project_sn=#{projectSn}
|
||||
<if test="devSn != null and devSn != ''">
|
||||
and dev_sn=#{devSn}
|
||||
</if>
|
||||
AND is_statistics=0
|
||||
and create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00')
|
||||
GROUP BY dev_sn
|
||||
</select>
|
||||
<select id="selectTenDaysWorkerAttendanceCountList" resultType="java.util.Map">
|
||||
SELECT DATE_FORMAT(p.create_time,"%Y-%m-%d") dayTitle,count(1) totalNum,
|
||||
IFNULL(sum((CASE WHEN person_type=1 then 1 ELSE 0 END)),0) lwPersonNum,
|
||||
IFNULL(sum((CASE WHEN person_type=2 then 1 ELSE 0 END)),0) glPersonNum
|
||||
SELECT DATE_FORMAT(p.create_time, "%Y-%m-%d") dayTitle,
|
||||
count(1) totalNum,
|
||||
IFNULL(sum((CASE WHEN person_type = 1 then 1 ELSE 0 END)), 0) lwPersonNum,
|
||||
IFNULL(sum((CASE WHEN person_type = 2 then 1 ELSE 0 END)), 0) glPersonNum
|
||||
from worker_attendance p
|
||||
INNER JOIN worker_info w1 ON w1.person_sn=p.person_sn
|
||||
where p.is_statistics=0 and w1.project_sn=#{projectSn}
|
||||
and p.create_time>=DATE_ADD(NOW(),INTERVAL -10 DAY)
|
||||
GROUP BY DATE_FORMAT(p.create_time,"%Y-%m-%d")
|
||||
order by DATE_FORMAT(p.create_time,"%Y-%m-%d")
|
||||
INNER JOIN worker_info w1 ON w1.person_sn = p.person_sn
|
||||
where p.is_statistics = 0
|
||||
and w1.project_sn = #{projectSn}
|
||||
and p.create_time >= DATE_ADD(NOW(), INTERVAL -10 DAY)
|
||||
GROUP BY DATE_FORMAT(p.create_time, "%Y-%m-%d")
|
||||
order by DATE_FORMAT(p.create_time, "%Y-%m-%d")
|
||||
</select>
|
||||
<select id="selectDepartmentEnterpriseAttendanceAnalysisList" resultType="java.util.Map">
|
||||
<!--select enterprise_id enterpriseId,
|
||||
IFNULL(sum((CASE WHEN dev_group_type=1 then num ELSE 0 END)),0) devGroupTypeNum1,
|
||||
IFNULL(sum((CASE WHEN dev_group_type=2 then num ELSE 0 END)),0) devGroupTypeNum2
|
||||
from (
|
||||
SELECT b.enterprise_id,c.dev_group_type dev_group_type,COUNT(DISTINCT a.person_sn) num
|
||||
from worker_attendance a INNER JOIN worker_info b On (a.person_sn=b.person_sn and a.project_sn=b.project_sn)
|
||||
INNER JOIN uface_dev c ON (a.dev_sn=c.dev_sn and a.project_sn=c.project_sn)
|
||||
where a.project_sn=#{projectSn} AND a.pass_type=#{passType}
|
||||
and a.create_time>=CONCAT(DATE_FORMAT(#{queryTime},"%Y-%m-%d"),' 00:00:00')
|
||||
and a.create_time<=CONCAT(DATE_FORMAT(#{queryTime},"%Y-%m-%d"),' 23:59:59')
|
||||
and b.enterprise_id in
|
||||
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
GROUP BY b.enterprise_id,c.dev_group_type
|
||||
) tp
|
||||
GROUP BY enterprise_id-->
|
||||
<!--select enterprise_id enterpriseId,
|
||||
IFNULL(sum((CASE WHEN dev_group_type=1 then num ELSE 0 END)),0) devGroupTypeNum1,
|
||||
IFNULL(sum((CASE WHEN dev_group_type=2 then num ELSE 0 END)),0) devGroupTypeNum2
|
||||
from (
|
||||
SELECT b.enterprise_id,c.dev_group_type dev_group_type,COUNT(DISTINCT a.person_sn) num
|
||||
from worker_attendance a INNER JOIN worker_info b On (a.person_sn=b.person_sn and a.project_sn=b.project_sn)
|
||||
INNER JOIN uface_dev c ON (a.dev_sn=c.dev_sn and a.project_sn=c.project_sn)
|
||||
where a.project_sn=#{projectSn} AND a.pass_type=#{passType}
|
||||
and a.create_time>=CONCAT(DATE_FORMAT(#{queryTime},"%Y-%m-%d"),' 00:00:00')
|
||||
and a.create_time<=CONCAT(DATE_FORMAT(#{queryTime},"%Y-%m-%d"),' 23:59:59')
|
||||
and b.enterprise_id in
|
||||
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
GROUP BY b.enterprise_id,c.dev_group_type
|
||||
) tp
|
||||
GROUP BY enterprise_id-->
|
||||
|
||||
SELECT parent_enterprise_id parentEnterpriseId,SUM(typeInNum1) typeInNum1,
|
||||
SUM(typeOutNum1) typeOutNum1,
|
||||
@ -465,10 +503,12 @@
|
||||
SELECT b.enterprise_id,p.parent_enterprise_id,
|
||||
SUM((CASE WHEN tp.typeInNum1>0 THEN 1 ELSE 0 END)) typeInNum1,
|
||||
SUM((CASE WHEN tp.typeOutNum1>0 THEN 1 ELSE 0 END)) typeOutNum1,
|
||||
SUM((CASE WHEN (tp.typeInNum1>0 AND tp.typeOutNum1=0) or (tp.typeOutNum1>0 AND tp.typeInNum1=0) THEN 1 ELSE 0 END)) diffNum1,
|
||||
SUM((CASE WHEN (tp.typeInNum1>0 AND tp.typeOutNum1=0) or (tp.typeOutNum1>0 AND tp.typeInNum1=0) THEN 1 ELSE 0
|
||||
END)) diffNum1,
|
||||
SUM((CASE WHEN tp.typeInNum2>0 THEN 1 ELSE 0 END)) typeInNum2,
|
||||
SUM((CASE WHEN tp.typeOutNum2>0 THEN 1 ELSE 0 END)) typeOutNum2,
|
||||
SUM((CASE WHEN (tp.typeInNum2>0 AND tp.typeOutNum2=0) or (tp.typeOutNum2>0 AND tp.typeInNum2=0) THEN 1 ELSE 0 END)) diffNum2
|
||||
SUM((CASE WHEN (tp.typeInNum2>0 AND tp.typeOutNum2=0) or (tp.typeOutNum2>0 AND tp.typeInNum2=0) THEN 1 ELSE 0
|
||||
END)) diffNum2
|
||||
from (SELECT a.person_sn,
|
||||
SUM((CASE WHEN pass_type=1 and c.dev_group_type=1 THEN 1 ELSE 0 END)) typeInNum1,
|
||||
SUM((CASE WHEN pass_type=1 and c.dev_group_type=2 THEN 1 ELSE 0 END)) typeInNum2,
|
||||
@ -502,7 +542,8 @@
|
||||
where a.project_sn=#{projectSn}
|
||||
and a.create_time>=CONCAT(DATE_FORMAT(#{queryTime},"%Y-%m-%d"),' 00:00:00')
|
||||
and a.create_time<=CONCAT(DATE_FORMAT(#{queryTime},"%Y-%m-%d"),' 23:59:59')
|
||||
and EXISTS (SELECT c.dev_sn from uface_dev c where a.dev_sn=c.dev_sn and a.project_sn=c.project_sn and c.dev_group_type=3)
|
||||
and EXISTS (SELECT c.dev_sn from uface_dev c where a.dev_sn=c.dev_sn and a.project_sn=c.project_sn and
|
||||
c.dev_group_type=3)
|
||||
GROUP BY a.person_sn) tp INNER JOIN worker_info b On (tp.person_sn=b.person_sn)
|
||||
where b.project_sn=#{projectSn} and b.person_type=2
|
||||
and b.enterprise_id in
|
||||
@ -513,33 +554,35 @@
|
||||
</select>
|
||||
<select id="selectDepartmentEnterpriseAttendanceWorkerInfoList" resultType="java.util.Map">
|
||||
SELECT cast(b.enterprise_id as char) enterpriseId,tp.person_sn personSn,
|
||||
b.worker_name workerName,b.id_card idCard,tp.inTime,tp.outTime,b.code_state codeState,c.enterprise_name enterpriseName,
|
||||
b.worker_name workerName,b.id_card idCard,tp.inTime,tp.outTime,b.code_state codeState,c.enterprise_name
|
||||
enterpriseName,
|
||||
(CASE WHEN b.code_state=3 THEN '绿码'
|
||||
WHEN b.code_state=2 THEN '黄码'
|
||||
WHEN b.code_state=1 THEN '红码'
|
||||
ELSE '无码' END) codeStateName
|
||||
<if test="devGroupType== '1'.toString()">
|
||||
,'工地区' devGroupTypeName,cast(p.parent_enterprise_id as char) manageEnterpriseId
|
||||
,'工地区' devGroupTypeName,cast(p.parent_enterprise_id as char) manageEnterpriseId
|
||||
</if>
|
||||
<if test="devGroupType== '2'.toString()">
|
||||
,'生活区' devGroupTypeName,cast(p.parent_enterprise_id as char) manageEnterpriseId
|
||||
,'生活区' devGroupTypeName,cast(p.parent_enterprise_id as char) manageEnterpriseId
|
||||
</if>
|
||||
<if test="devGroupType== '3'.toString()">
|
||||
,'项目部' devGroupTypeName,cast(b.enterprise_id as char) manageEnterpriseId
|
||||
,'项目部' devGroupTypeName,cast(b.enterprise_id as char) manageEnterpriseId
|
||||
</if>
|
||||
from
|
||||
(SELECT a.person_sn,
|
||||
<if test="passType== '1'.toString()">
|
||||
MIN(create_time) inTime,'' outTime
|
||||
MIN(create_time) inTime,'' outTime
|
||||
</if>
|
||||
<if test="passType== '2'.toString()">
|
||||
'' inTime,max(create_time) outTime
|
||||
'' inTime,max(create_time) outTime
|
||||
</if>
|
||||
FROM worker_attendance a
|
||||
where a.project_sn=#{projectSn} AND a.pass_type=#{passType}
|
||||
and a.create_time>=CONCAT(DATE_FORMAT(#{queryTime},"%Y-%m-%d"),' 00:00:00')
|
||||
and a.create_time<=CONCAT(DATE_FORMAT(#{queryTime},"%Y-%m-%d"),' 23:59:59')
|
||||
and EXISTS (SELECT c.dev_sn from uface_dev c where a.dev_sn=c.dev_sn and a.project_sn=c.project_sn and c.dev_group_type=#{devGroupType})
|
||||
and EXISTS (SELECT c.dev_sn from uface_dev c where a.dev_sn=c.dev_sn and a.project_sn=c.project_sn and
|
||||
c.dev_group_type=#{devGroupType})
|
||||
GROUP BY a.person_sn
|
||||
) tp INNER JOIN worker_info b On (tp.person_sn=b.person_sn)
|
||||
INNER JOIN enterprise_info c ON b.enterprise_id=c.id
|
||||
@ -548,11 +591,11 @@
|
||||
</if>
|
||||
where b.project_sn=#{projectSn}
|
||||
<if test="devGroupType== '3'.toString()">
|
||||
and b.person_type=2
|
||||
and b.person_type=2
|
||||
</if>
|
||||
and b.enterprise_id in
|
||||
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
#{item}
|
||||
</foreach>
|
||||
</select>
|
||||
<select id="selectEnterpriseAttendanceWorkerInfoCount" resultType="java.util.Map">
|
||||
@ -599,15 +642,14 @@
|
||||
and w1.enterprise_id=#{enterpriseId}
|
||||
</if>
|
||||
<if test="userEnterpriseId!=null and userEnterpriseId!=''">
|
||||
and FIND_IN_SET(w1.enterprise_id,#{userEnterpriseId})
|
||||
and FIND_IN_SET(w1.enterprise_id,#{userEnterpriseId})
|
||||
</if>
|
||||
order by p.create_time desc
|
||||
</select>
|
||||
<select id="selectTodayAttendanceWorkerCount" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
|
||||
SELECT
|
||||
COUNT(DISTINCT w1.id) total_attendance_person,
|
||||
IFNULL(sum((CASE WHEN person_type = 1 then 1 ELSE 0 END)), 0) lw_person_total,
|
||||
IFNULL(sum((CASE WHEN person_type = 2 then 1 ELSE 0 END)), 0) gl_person_total
|
||||
SELECT COUNT(DISTINCT w1.id) total_attendance_person,
|
||||
IFNULL(sum((CASE WHEN person_type = 1 then 1 ELSE 0 END)), 0) lw_person_total,
|
||||
IFNULL(sum((CASE WHEN person_type = 2 then 1 ELSE 0 END)), 0) gl_person_total
|
||||
from worker_info w1
|
||||
INNER JOIN
|
||||
(SELECT DISTINCT person_sn
|
||||
|
||||
@ -134,8 +134,8 @@ public class UfaceDevServiceImpl extends ServiceImpl<UfaceDevMapper, UfaceDev> i
|
||||
if(attendanceList!=null&&attendanceList.size()>0){
|
||||
for(Map<String, Object> count:attendanceList){
|
||||
if(MapUtils.getString(dev,"devSn").equals(MapUtils.getString(count,"devSn"))){
|
||||
inTotalNum=MapUtils.getInteger(dev,"inTotalNum");
|
||||
outTotalNum=MapUtils.getInteger(dev,"outTotalNum");
|
||||
inTotalNum=MapUtils.getInteger(count,"inTotalNum");
|
||||
outTotalNum=MapUtils.getInteger(count,"outTotalNum");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,7 +15,6 @@ import com.zhgd.jeecg.common.mybatis.EntityMap;
|
||||
import com.zhgd.xmgl.async.AsyncSendAttendance;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.ICompanyService;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.UploadFileService;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.impl.UploadFileServiceImpl;
|
||||
import com.zhgd.xmgl.modules.govtapi.GovtOpenApiService;
|
||||
import com.zhgd.xmgl.modules.project.entity.ProjectUfaceConfig;
|
||||
import com.zhgd.xmgl.modules.project.mapper.ProjectUfaceConfigMapper;
|
||||
@ -394,8 +393,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
|
||||
String showTime = df.format(new Date());
|
||||
int type = getPassType(ufaceDev, showTime);
|
||||
QueryWrapper<WorkerInfo> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.lambda().eq(WorkerInfo::getPersonSn, MapUtils.getString(map, "personSn"))
|
||||
.eq(WorkerInfo::getProjectSn, MapUtils.getString(map, "projectSn"));
|
||||
queryWrapper.lambda().eq(WorkerInfo::getPersonSn, MapUtils.getString(map, "personSn")).eq(WorkerInfo::getProjectSn, MapUtils.getString(map, "projectSn"));
|
||||
WorkerInfo info = workerInfoMapper.selectOne(queryWrapper);
|
||||
if (info != null) {
|
||||
WorkerAttendance workerAttendance = new WorkerAttendance();
|
||||
@ -725,6 +723,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
|
||||
String idCard = MapUtils.getString(map, "idCard");
|
||||
Integer type = MapUtils.getInteger(map, "passType");
|
||||
String projectSn = MapUtils.getString(map, "projectSn");
|
||||
String devSn = MapUtils.getString(map, "devSn");
|
||||
//String passTime=MapUtils.getString(map,"snapTime");
|
||||
WorkerInfo info = workerInfoMapper.selectWorkWorkerInfoWithIDCard(idCard, projectSn);
|
||||
if (info != null) {
|
||||
@ -737,9 +736,10 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
|
||||
workerAttendance.setPersonSn(info.getPersonSn());
|
||||
workerAttendance.setCreateTime(MapUtils.getString(map, "snapTime"));
|
||||
workerAttendance.setProjectSn(projectSn);
|
||||
workerAttendance.setDevSn(devSn);
|
||||
workerAttendance.setPassType(type);
|
||||
workerAttendance.setCardType(2);
|
||||
if (profileJudgeUtil.isJlwProd()) {
|
||||
if (profileJudgeUtil.isJlw()) {
|
||||
workerAttendance.setIsStatistics(0);
|
||||
} else {
|
||||
workerAttendance.setIsStatistics(1);
|
||||
@ -770,8 +770,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
|
||||
Integer type = MapUtils.getInteger(map, "direction");
|
||||
String projectSn = MapUtils.getString(map, "projectCode");
|
||||
QueryWrapper<UfaceDev> devQueryWrapper = new QueryWrapper<>();
|
||||
devQueryWrapper.lambda().eq(UfaceDev::getDevSn, MapUtils.getString(map, "devCode"))
|
||||
.eq(UfaceDev::getProjectSn, projectSn);
|
||||
devQueryWrapper.lambda().eq(UfaceDev::getDevSn, MapUtils.getString(map, "devCode")).eq(UfaceDev::getProjectSn, projectSn);
|
||||
UfaceDev ufaceDev = ufaceDevMapper.selectOne(devQueryWrapper);
|
||||
if (ufaceDev != null) {
|
||||
WorkerInfo info = workerInfoMapper.selectWorkWorkerInfoWithIDCard(idCard, projectSn);
|
||||
@ -883,9 +882,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
|
||||
asyncSendAttendance.saveAndSendAttendance(workerAttendance, info);
|
||||
|
||||
if ((vaccineTimes != null) || (nadCode != null && nadTime != null)) {
|
||||
if ((vaccineTimes != null && info.getVaccineStatus() != null && vaccineTimes.intValue() != info.getVaccineStatus()) ||
|
||||
(nadCode != null && info.getNadCode() != null && nadCode.intValue() != info.getNadCode()) ||
|
||||
(nadTime != null && !nadTime.equals(info.getNadTime()))) {
|
||||
if ((vaccineTimes != null && info.getVaccineStatus() != null && vaccineTimes.intValue() != info.getVaccineStatus()) || (nadCode != null && info.getNadCode() != null && nadCode.intValue() != info.getNadCode()) || (nadTime != null && !nadTime.equals(info.getNadTime()))) {
|
||||
info.setVaccineStatus(vaccineTimes);
|
||||
//info.setVaccineTimes(vaccineTimes);
|
||||
info.setNadCode(nadCode);
|
||||
|
||||
@ -45,8 +45,8 @@ public class VideoTask {
|
||||
@Value("${serverUrl}")
|
||||
private String serverUrl;
|
||||
|
||||
// @SchedulerLock(name = "updateVideoState", lockAtMostFor = 1000*60*60, lockAtLeastFor = 1000*60*5)
|
||||
// @Scheduled(cron = "0 0 */3 * * ?")
|
||||
@SchedulerLock(name = "updateVideoState", lockAtMostFor = 1000*60*60, lockAtLeastFor = 1000*60*5)
|
||||
@Scheduled(cron = "0 0 */3 * * ?")
|
||||
// @Scheduled(cron = "*/50 * * * * ?")
|
||||
public void updateVideoState(){
|
||||
try{
|
||||
|
||||
@ -3,7 +3,6 @@ package com.zhgd.xmgl.util;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
@ -23,6 +22,15 @@ public class ProfileJudgeUtil {
|
||||
return "ljw".equals(activeProfile);
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否金林湾环境
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public boolean isJlw() {
|
||||
return Stream.of("ljw", "ljw-gsx").anyMatch(s -> s.equals(activeProfile));
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否三江本地环境
|
||||
*
|
||||
|
||||
74
src/main/resources/application-dev-gsx.properties
Normal file
74
src/main/resources/application-dev-gsx.properties
Normal file
@ -0,0 +1,74 @@
|
||||
#http.port=30250
|
||||
http.port=18070
|
||||
#spring.datasource.url=jdbc:mysql://124.71.178.44:3306/wisdomsite_lgdc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
||||
#spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC
|
||||
#spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
||||
#spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
||||
#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
|
||||
#spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
|
||||
spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsite_yanshi?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&useSSL=false
|
||||
spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
|
||||
spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)
|
||||
server.port=8070
|
||||
#server.port=30246
|
||||
basePath=C:/jxj/prod/backEnd/itbgpImage/
|
||||
server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/
|
||||
#arcsoft.dllPath=D:/hz/wisdomSite/src/main/resources/dll
|
||||
#basePath=F:/zhgd/itbgpImage/
|
||||
#server.tomcat.basedir=F:/zhgd/tempImage/
|
||||
#arcsoft.dllPath=F:/zhgd/dll
|
||||
arcsoft.dllPath=C:/jxj/prod/backEnd/dll
|
||||
security.enable=false
|
||||
isGetStandardData=false
|
||||
isGetEnvironmentData=false
|
||||
isGetFaceFeatureDate=false
|
||||
#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362
|
||||
video.alarm.newUrl=223.82.100.80:6040
|
||||
wx-appid=
|
||||
wx-AppSecret=
|
||||
mqtt-scope=zjsjTopic
|
||||
serverUrl=http://124.71.67.160:8088/
|
||||
#serverUrl=http://182.90.224.237:7000
|
||||
#serverUrl=http://127.0.0.1:6023
|
||||
#\u89C6\u9891\u5206\u6790url
|
||||
video-analysis-url=
|
||||
server.ssl.enabled=false
|
||||
#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A
|
||||
defaultZwComapnySn=
|
||||
#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E
|
||||
#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0
|
||||
spring.file-storage.default-platform=local
|
||||
#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011
|
||||
spring.file-storage.thumbnail-suffix=.jpg
|
||||
# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199
|
||||
# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6
|
||||
spring.file-storage.local[0].platform=local
|
||||
#\u542F\u7528\u5B58\u50A8
|
||||
spring.file-storage.local[0].enable-storage=true
|
||||
#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09
|
||||
spring.file-storage.local[0].enable-access=false
|
||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D
|
||||
spring.file-storage.local[0].domain=
|
||||
# \u5B58\u50A8\u5730\u5740
|
||||
spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/
|
||||
# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6
|
||||
spring.file-storage.local[0].path-patterns=
|
||||
spring.file-storage.aliyun-oss[0].platform=aliyun-oss
|
||||
spring.file-storage.aliyun-oss[0].enable-storage=false
|
||||
spring.file-storage.aliyun-oss[0].access-key=
|
||||
spring.file-storage.aliyun-oss[0].secret-key=
|
||||
spring.file-storage.aliyun-oss[0].end-point=
|
||||
spring.file-storage.aliyun-oss[0].bucket-name=
|
||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/
|
||||
spring.file-storage.aliyun-oss[0].domain=
|
||||
spring.file-storage.aliyun-oss[0].base-path=
|
||||
# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D
|
||||
spring.boot.admin.client.instance.service-url=http://localhost:18070
|
||||
spring.boot.admin.client.instance.name=zjsj
|
||||
# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740
|
||||
double-carbon.water-data-url=http://test.cesms.net
|
||||
double-carbon.ammeter-data-url=http://test.cesms.net
|
||||
license.licensePath=C:/jxj/prod/backEnd/license/license.lic
|
||||
license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore
|
||||
#\u9AD8\u652F\u6A21\u7684tcp\u670D\u52A1\u7AEF\u7684\u7AEF\u53E3\u53F7
|
||||
high_formwork.netty.port=15333
|
||||
86
src/main/resources/application-ljw-gsx.properties
Normal file
86
src/main/resources/application-ljw-gsx.properties
Normal file
@ -0,0 +1,86 @@
|
||||
http.port=34223
|
||||
spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsite_hl_new?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&useSSL=false
|
||||
spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
|
||||
spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)
|
||||
server.port=12350
|
||||
basePath=C:/jxj/prod/backEnd/itbgpImage/
|
||||
arcsoft.dllPath=C:/jxj/prod/backEnd/dll
|
||||
security.enable=false
|
||||
isGetStandardData=false
|
||||
isGetEnvironmentData=false
|
||||
isGetFaceFeatureDate=false
|
||||
#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362
|
||||
video.alarm.newUrl=223.82.100.80:6040
|
||||
wx-appid=
|
||||
wx-AppSecret=
|
||||
mqtt.username=admin
|
||||
mqtt.password=public
|
||||
#mqtt.url=tcp://139.159.226.224:1883
|
||||
mqtt.url=ws://121.196.214.246:8083/mqtt
|
||||
mqtt.producer.clientId=mqttProd
|
||||
mqtt.producer.defaultTopic=topic1
|
||||
mqtt.consumer.clientId=mqttConsumer
|
||||
mqtt.consumer.defaultTopic=topic1
|
||||
mqtt-scope=prodTopic
|
||||
serverUrl=http://124.71.178.44:8
|
||||
#\u89C6\u9891\u5206\u6790url
|
||||
video-analysis-url=
|
||||
#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A
|
||||
defaultZwComapnySn=
|
||||
#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E
|
||||
#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0
|
||||
spring.file-storage.default-platform=local
|
||||
#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011
|
||||
spring.file-storage.thumbnail-suffix=.jpg
|
||||
# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199
|
||||
# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6
|
||||
spring.file-storage.local[0].platform=local
|
||||
#\u542F\u7528\u5B58\u50A8
|
||||
spring.file-storage.local[0].enable-storage=true
|
||||
#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09
|
||||
spring.file-storage.local[0].enable-access=false
|
||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D
|
||||
spring.file-storage.local[0].domain=
|
||||
# \u5B58\u50A8\u5730\u5740
|
||||
spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/
|
||||
# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6
|
||||
spring.file-storage.local[0].path-patterns=
|
||||
spring.file-storage.aliyun-oss[0].platform=aliyun-oss
|
||||
spring.file-storage.aliyun-oss[0].enable-storage=false
|
||||
spring.file-storage.aliyun-oss[0].access-key=
|
||||
spring.file-storage.aliyun-oss[0].secret-key=
|
||||
spring.file-storage.aliyun-oss[0].end-point=
|
||||
spring.file-storage.aliyun-oss[0].bucket-name=
|
||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/
|
||||
spring.file-storage.aliyun-oss[0].domain=
|
||||
spring.file-storage.aliyun-oss[0].base-path=
|
||||
#\u5BA2\u6237\u7AEF License\u76F8\u5173\u914D\u7F6E
|
||||
#license.licensePath=D:/license_demo/client/license.lic
|
||||
#license.publicKeysStorePath=D:/license_demo/client/publicCerts.keystore
|
||||
|
||||
#redis
|
||||
spring.redis.database=1
|
||||
spring.redis.host=127.0.0.1
|
||||
spring.redis.port=6379
|
||||
spring.redis.password=
|
||||
spring.redis.timeout=2000s
|
||||
spring.redis.lettuce.pool.max-active=8
|
||||
spring.redis.lettuce.pool.max-wait=60s
|
||||
spring.redis.lettuce.pool.max-idle=10
|
||||
spring.redis.lettuce.pool.min-idle=10
|
||||
|
||||
server.tomcat.basedir=C:/tempImage/
|
||||
|
||||
license.licensePath=C:/license/license.lic
|
||||
license.publicKeysStorePath=C:/license/publicCerts.keystore
|
||||
|
||||
govt.host=http://47.96.183.143/uatapi
|
||||
|
||||
server.ssl.enabled=false
|
||||
|
||||
# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D
|
||||
spring.boot.admin.client.instance.service-url=http://localhost:18070
|
||||
spring.boot.admin.client.instance.name=zjsj
|
||||
# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740
|
||||
double-carbon.water-data-url=http://test.cesms.net
|
||||
double-carbon.ammeter-data-url=http://test.cesms.net
|
||||
@ -3,7 +3,7 @@ spring.datasource.url=jdbc:mysql://rm-bp193ccsu13275r6zvo.mysql.rds.aliyuncs.com
|
||||
spring.datasource.username=ENC(t/9Q0+VWLJLClUjYqLoq6ST+CX09Fz4j)
|
||||
spring.datasource.password=ENC(ft9y6csuEXIillKpdFSQRdA4gDH0XufJ)
|
||||
server.port=6688
|
||||
basePath=/data
|
||||
basePath=/data/
|
||||
arcsoft.dllPath=/dll
|
||||
security.enable=false
|
||||
isGetStandardData=false
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user