diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml index 07d036ccd..5d749c4d5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml @@ -38,9 +38,9 @@ order by t3.parent_id,t3.priority @@ -51,4 +51,4 @@ WHERE b.user_id=#{userId} and a.status=1 and m.style_type=#{styleType} order by a.parent_id,a.priority - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerAlarmController.java index 305c0c7e9..40c8af76a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerAlarmController.java @@ -12,6 +12,7 @@ import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.bigdevice.entity.Tower; import com.zhgd.xmgl.modules.bigdevice.entity.TowerAlarm; +import com.zhgd.xmgl.modules.bigdevice.entity.vo.AlarmsDistinguishedNumberByAlarmType; import com.zhgd.xmgl.modules.bigdevice.service.ITowerAlarmService; import com.zhgd.xmgl.modules.bigdevice.service.ITowerService; import io.swagger.annotations.Api; @@ -340,4 +341,17 @@ public class TowerAlarmController { return Result.error("参数错误 ").data(false); } } + + @ApiOperation(value = "查询报警数量（按报警类型区分）", notes = "查询报警数量（按报警类型区分）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "queryStartTime", value = "查询开始时间，格式：2023-05-22 18:00:00", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "queryEndTime", value = "查询结束时间，格式：2023-05-22 18:00:00", paramType = "query", required = true, dataType = "String"), + }) + @PostMapping(value = "/queryAlarmsDistinguishedNumberByAlarmType") + public Result queryAlarmsDistinguishedNumberByAlarmType(@RequestBody Map map) { + return Result.success(towerAlarmService.queryAlarmsDistinguishedNumberByAlarmType(map)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerController.java index e49079fe8..cbbf48ea2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerController.java @@ -6,6 +6,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.bigdevice.entity.Tower; import com.zhgd.xmgl.modules.bigdevice.entity.vo.TowerAndDataInfoVO; +import com.zhgd.xmgl.modules.bigdevice.entity.vo.TowerNumAndAlarmCount; import com.zhgd.xmgl.modules.bigdevice.service.ITowerService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -149,7 +150,7 @@ public class TowerController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), }) @PostMapping(value = "/selectTowerNumAndAlarmCount") - public Result> selectTowerNumAndAlarmCount(@RequestBody Map map) { + public Result selectTowerNumAndAlarmCount(@RequestBody Map map) { return Result.success(towerService.selectTowerNumAndAlarmCount(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/AlarmsDistinguishedNumberByAlarmType.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/AlarmsDistinguishedNumberByAlarmType.java new file mode 100644 index 000000000..5da7ac2db --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/AlarmsDistinguishedNumberByAlarmType.java @@ -0,0 +1,32 @@ +package com.zhgd.xmgl.modules.bigdevice.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmsDistinguishedNumberByAlarmType { + @ApiModelProperty(value = "报警总数") + private Integer alarmNum; + private List typeNumList; + + @Data + public static class TypeNum { + @ApiModelProperty(value = "报警类型：momentAlarm>力矩报警 0: 正常 1:报警 2:预警\n" + + "windSpeedAlarm>风速报警 0: 正常 1:报警 2:预警\n" + + "heightAlarm>高度上限位报警 0: 正常 1:报警 2:预警\n" + + "heightLowerAlarm>高度下限位报警 0: 正常 1:报警 2:预警\n" + + "minRangeAlarm>幅度内限位报警 0: 正常 1:报警 2:预警\n" + + "maxRangeAlarm>幅度外限位报警 0: 正常 1:报警 2:预警\n" + + "posAngleAlarm>顺时针回转限位报警 0: 正常 1:报警 2:预警\n" + + "negAngleAlarm>逆时针回转限位报警 0: 正常 1:报警 2:预警\n" + + "obliguityAlarm>倾角报警 0: 正常 1:报警 2:预警\n" + + "environmentAlarm>环境防撞报警 0: 正常 1:报警 2:预警\n" + + "multiAlarm>多机防撞报警 0: 正常 1:报警 2:预警\n" + + "standardHighAlarm>塔机间竖向高度报警 0: 正常 1:报警 2:预警") + private String type; + @ApiModelProperty(value = "报警数量") + private Integer num; + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/DriverVO.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/DriverVO.java index cda812f39..262d76e09 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/DriverVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/DriverVO.java @@ -14,8 +14,6 @@ import lombok.NoArgsConstructor; */ @Data @ApiModel(value = "驾驶员信息", description = "驾驶员信息") -@NoArgsConstructor -@AllArgsConstructor public class DriverVO { @ApiModelProperty(value = "驾驶员名称") private String workerName; @@ -28,4 +26,14 @@ public class DriverVO { @ApiModelProperty(value = "司机照片") private String imageUrl; + @ApiModelProperty(value = "性别，1男，2女") + private java.lang.Integer sex; + @ApiModelProperty(value = "年龄") + private java.lang.Integer age; + @ApiModelProperty(value = "工作年限") + private java.lang.Integer workYear; + @ApiModelProperty(value = "本次连续工作时长（分钟）") + private java.lang.Integer continuousWorkingTime; + @ApiModelProperty(value = "身份证号") + private java.lang.String idCard; } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/TowerCurrentCountVo.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/TowerCurrentCountVo.java new file mode 100644 index 000000000..d410f5f78 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/TowerCurrentCountVo.java @@ -0,0 +1,25 @@ +package com.zhgd.xmgl.modules.bigdevice.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class TowerCurrentCountVo { + @ApiModelProperty(value = "设备sn") + private String devSn; + @ApiModelProperty(value = "今日吊次") + private String cycleNum; + private String faultNum; + @ApiModelProperty(value = "今日告警数量") + private Integer alarmNum; + private String devOnline; + private Integer warningNum; + @ApiModelProperty(value = "设备名称") + private String devName; + @ApiModelProperty(value = "配置载重功能 0:未配置 1:已配置") + private Integer weightSet; + @ApiModelProperty(value = "今日吊重") + private Double totalLoading; + @ApiModelProperty(value = "工作时长（运行时间，塔吊工作循环时长）") + private Integer runMinuteTime; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/TowerNumAndAlarmCount.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/TowerNumAndAlarmCount.java new file mode 100644 index 000000000..e7f2a0fab --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/TowerNumAndAlarmCount.java @@ -0,0 +1,57 @@ +package com.zhgd.xmgl.modules.bigdevice.entity.vo; + +import com.zhgd.xmgl.modules.bigdevice.entity.Tower; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class TowerNumAndAlarmCount { + private DevCount devCount; + private AlarmCount alarmCount; + @ApiModelProperty(value = "故障总数") + private Integer faultNum; + @ApiModelProperty(value = "设备列表") + private List deviceList; + + @Data + public static class DevCount { + + private Integer collideOnlineRatio; + @ApiModelProperty(value = "在线设备数量") + private Integer devOnline; + @ApiModelProperty(value = "防碰撞的在线设备数量") + private Integer collideDevOnline; + @ApiModelProperty(value = "防碰撞的设备数量") + private Integer collideDevNum; + @ApiModelProperty(value = "塔吊设备数量") + private String devNum; + + } + + @Data + public static class AlarmCount { + + @ApiModelProperty(value = "报警总数") + private Integer alarmNum; + @ApiModelProperty(value = "预警总数") + private Integer warningNum; + @ApiModelProperty(value = "报警+预警总数") + private String totalAlarmNum; + @ApiModelProperty(value = "违章总数") + private String violationNum; + + @ApiModelProperty(value = "报警总数（相比昨日同一时间）") + private Integer alarmNumYesterdaySameTime; + @ApiModelProperty(value = "预警总数（相比昨日同一时间）") + private Integer warningNumYesterdaySameTime; + @ApiModelProperty(value = "报警+预警总数（相比昨日同一时间）") + private Integer totalAlarmNumYesterdaySameTime; + @ApiModelProperty(value = "违章总数（相比昨日同一时间）") + private Integer violationNumYesterdaySameTime; + @ApiModelProperty(value = "违章总数（相比过去30日平均值）") + private Integer violationNumBefore30Day; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerAlarmMapper.java index 7935e8c00..55e17cff2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerAlarmMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.bigdevice.entity.TowerAlarm; +import com.zhgd.xmgl.modules.bigdevice.entity.vo.AlarmsDistinguishedNumberByAlarmType; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -31,6 +32,14 @@ public interface TowerAlarmMapper extends BaseMapper { Map selectCurrentAlarmCount(Map map); + /** + * 昨日同时间 + * + * @param map + * @return + */ + Map selectYesterdaySameTimeAlarmCount(Map map); + Map selectYesterdayAlarmCount(Map map); List> selectHourTowerAlarmCount(Map map); @@ -67,4 +76,7 @@ public interface TowerAlarmMapper extends BaseMapper { List> selectTowerDevAlarmGroupCount(Map map); IPage selectPageInfo(Page page, @Param("map") Map map); + + List queryAlarmsByTime(Map map); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerViolationMapper.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerViolationMapper.java index 3ad40b678..be0baacba 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerViolationMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerViolationMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.bigdevice.entity.TowerViolation; +import com.zhgd.xmgl.modules.bigdevice.entity.vo.TowerNumAndAlarmCount; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -38,4 +39,6 @@ public interface TowerViolationMapper extends BaseMapper { List> selectAllProjectTowerViolationList(Map map); List> selectAllProjectTowerAlarmViolationList(Map map); + + TowerNumAndAlarmCount.AlarmCount selectViolation30DaysTodayYesterdayCount(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml index 969eaca7c..e30e86564 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml @@ -107,15 +107,14 @@ - \ No newline at end of file + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerMapper.xml index 645b90e69..e1f3d9440 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerMapper.xml @@ -252,27 +252,28 @@ de.dev_sn devSn, de.dev_name devName, IFNULL(((case - when round((UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(de.real_time)) / 60) <= 30 then 1 - else 0 end)), 0) devOnline, - IFNULL(tp.cycleNum, 0) cycleNum, - IFNULL(tp.totalLoading, 0) totalLoading, - IFNULL(tp2.faultNum, 0) faultNum, - IFNULL(tp3.alarmNum, 0) alarmNum, - IFNULL(tp3.warningNum, 0) warningNum + when round((UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(de.real_time)) / 60) <= 30 then 1 + else 0 end)), 0) devOnline, + IFNULL(tp.cycleNum, 0) cycleNum, + IFNULL(tp.totalLoading, 0) totalLoading, + IFNULL(tp2.faultNum, 0) faultNum, + IFNULL(tp3.alarmNum, 0) alarmNum, + IFNULL(tp3.warningNum, 0) warningNum FROM tower de - LEFT JOIN (select a.dev_sn, - count(1) cycleNum, - IFNULL(SUM(loading), 0) totalLoading - FROM tower_work_cycle a - WHERE a.project_sn = #{projectSn} - AND a.start_time >= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00') - group by a.dev_sn + LEFT JOIN (select a.dev_sn, + count(1) cycleNum, + IFNULL(SUM(TIMESTAMPDIFF(MINUTE,a.start_time,a.end_time)),0) runMinuteTime, + IFNULL(SUM(loading), 0) totalLoading + FROM tower_work_cycle a + WHERE a.project_sn = #{projectSn} + AND a.start_time >= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00') + group by a.dev_sn ) tp ON de.dev_sn = tp.dev_sn - LEFT JOIN (SELECT dev_sn, COUNT(1) faultNum - from tower_fault - WHERE project_sn = #{projectSn} - AND add_time >= CONCAT(DATE_FORMAT(NOW(), '%Y-%m-%d'), ' 00:00:00') - group by dev_sn + LEFT JOIN (SELECT dev_sn, COUNT(1) faultNum + from tower_fault + WHERE project_sn = #{projectSn} + AND add_time >= CONCAT(DATE_FORMAT(NOW(), '%Y-%m-%d'), ' 00:00:00') + group by dev_sn ) tp2 ON de.dev_sn = tp2.dev_sn LEFT JOIN (SELECT dev_sn, IFNULL(SUM((case when alarm_type = 1 then 1 else 0 end)), 0) alarmNum, @@ -672,7 +673,8 @@ - + @@ -683,21 +685,31 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerViolationMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerViolationMapper.xml index 65a24a7ec..b001a83dc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerViolationMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerViolationMapper.xml @@ -462,6 +462,42 @@ ) tp where totalNum>0 order by totalNum desc - - \ No newline at end of file + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerAlarmService.java index 5057f2b1d..2ec5e3031 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerAlarmService.java @@ -5,6 +5,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.bigdevice.entity.TowerAlarm; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.bigdevice.entity.TowerCurrentData; +import com.zhgd.xmgl.modules.bigdevice.entity.vo.AlarmsDistinguishedNumberByAlarmType; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -52,13 +53,15 @@ public interface ITowerAlarmService extends IService { List> selectProjectTowerAlarmCountList(Map map); - List> selectAllProjectTowerAlarmList(Map map); + List> selectAllProjectTowerAlarmList(Map map); Map selectComapnyTowerAlarmCount(Map param); - List> selectTowerAlarmTrendList(Map map); + List> selectTowerAlarmTrendList(Map map); List selectProjectNewestTowerAlarmList(Map map); IPage selectPageInfo(Map map); + + AlarmsDistinguishedNumberByAlarmType queryAlarmsDistinguishedNumberByAlarmType(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerService.java index cf815b0e7..ca8de51d6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerService.java @@ -6,6 +6,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.bigdevice.entity.Tower; import com.zhgd.xmgl.modules.bigdevice.entity.TowerAlarm; import com.zhgd.xmgl.modules.bigdevice.entity.vo.TowerAndDataInfoVO; +import com.zhgd.xmgl.modules.bigdevice.entity.vo.TowerNumAndAlarmCount; import java.util.List; import java.util.Map; @@ -38,7 +39,7 @@ public interface ITowerService extends IService { void deleteProjectBigDevicesData(String projectSn); - Map selectTowerNumAndAlarmCount(Map map); + TowerNumAndAlarmCount selectTowerNumAndAlarmCount(Map map); List> selectTowerCurrentCount(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java index f9245c37d..00b5ac3da 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java @@ -322,8 +322,14 @@ public class LifterServiceImpl extends ServiceImpl impleme LifterCurrentData newData = redisRepository.getOrSet("lifterCurrentData" + lifter.getProjectSn() + lifter.getDevSn(), (() -> lifterCurrentDataMapper.getNewData(devSn))); log.info("getRelatedInfo升降机实时数据信息：{}", newData); - List driverList = lifter.getDriverList().stream().map(driver -> new DriverVO(driver.getDriverName(), - driver.getDriverPhone(), driver.getCertificateNumber(), driver.getImageUrl())).collect(Collectors.toList()); + List driverList = lifter.getDriverList().stream().map(driver -> { + DriverVO driverVO = new DriverVO(); + driverVO.setWorkerName(driver.getDriverName()); + driverVO.setPhoneNumber(driver.getDriverPhone()); + driverVO.setSpecialCertificateNumber(driver.getCertificateNumber()); + driverVO.setImageUrl(driver.getImageUrl()); + return driverVO; + }).collect(Collectors.toList()); DevWorkerVO devWorker = new DevWorkerVO(lifter.getDevName(), lifter.getDevSn(), lifter.getRegistNo(), lifter.getFactoryName(), lifter.getMaxLoad(), driverList); LifterDataInfoDTO lifterDataInfo = new LifterDataInfoDTO().setTotalFloor(lifter.getTotalFloor()).setHeight(lifter.getMaxHeight()); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerAlarmServiceImpl.java index 88db50ebb..6b39131af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerAlarmServiceImpl.java @@ -11,6 +11,7 @@ import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.modules.bigdevice.entity.Tower; import com.zhgd.xmgl.modules.bigdevice.entity.TowerAlarm; import com.zhgd.xmgl.modules.bigdevice.entity.TowerCurrentData; +import com.zhgd.xmgl.modules.bigdevice.entity.vo.AlarmsDistinguishedNumberByAlarmType; import com.zhgd.xmgl.modules.bigdevice.mapper.TowerAlarmMapper; import com.zhgd.xmgl.modules.bigdevice.mapper.TowerCurrentDataMapper; import com.zhgd.xmgl.modules.bigdevice.mapper.TowerFaultMapper; @@ -20,6 +21,7 @@ import com.zhgd.xmgl.modules.bigdevice.service.ITowerService; import com.zhgd.xmgl.util.DateUtil; import com.zhgd.xmgl.util.JxlExcelUtils; import com.zhgd.xmgl.util.MessageUtil; +import com.zhgd.xmgl.util.ReflectionUtil; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -552,4 +554,96 @@ public class TowerAlarmServiceImpl extends ServiceImpl(pageNo, pageSize), map); } + + @Override + public AlarmsDistinguishedNumberByAlarmType queryAlarmsDistinguishedNumberByAlarmType(Map map) { + String queryEndTime = map.getOrDefault("queryEndTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")).toString(); + String queryStartTime = map.getOrDefault("queryStartTime", DateUtil.offsetDay(new Date(), -7)).toString(); + map.putIfAbsent("queryEndTime", queryEndTime); + map.putIfAbsent("queryStartTime", queryStartTime); + List towerAlarms = towerAlarmMapper.queryAlarmsByTime(map); + Map countTowerAlarmByTypeMap = countTowerAlarmByType(towerAlarms); + List typeNums = new ArrayList<>(); + for (Map.Entry entry : countTowerAlarmByTypeMap.entrySet()) { + AlarmsDistinguishedNumberByAlarmType.TypeNum typeNum = new AlarmsDistinguishedNumberByAlarmType.TypeNum(); + typeNum.setType(entry.getKey()); + typeNum.setNum(entry.getValue()); + } + Integer count = countTowerAlarmByTypeMap.size(); + AlarmsDistinguishedNumberByAlarmType rt = new AlarmsDistinguishedNumberByAlarmType(); + rt.setAlarmNum(count); + rt.setTypeNumList(typeNums); + return rt; + } + + /** + * 按报警类型统计数量 + * + * @param towerAlarms + */ + private Map countTowerAlarmByType(List towerAlarms) { + Map typeNumMap = new HashMap<>(); + for (TowerAlarm towerAlarm : towerAlarms) { + if (Objects.equals(towerAlarm.getMomentAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getMomentAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getWindSpeedAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getWindSpeedAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getHeightAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getHeightAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getHeightLowerAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getHeightLowerAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getMinRangeAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getMinRangeAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getMaxRangeAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getMaxRangeAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getPosAngleAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getPosAngleAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getNegAngleAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getNegAngleAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getObliguityAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getObliguityAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getEnvironmentAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getEnvironmentAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getMultiAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getMultiAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + if (Objects.equals(towerAlarm.getStandardHighAlarm(), 1)) { + String fieldName = ReflectionUtil.getFieldName(TowerAlarm::getStandardHighAlarm); + addTowerAlarmCountByType(typeNumMap, fieldName); + } + } + return typeNumMap; + } + + private void addTowerAlarmCountByType(Map typeNumMap, String fieldName) { + Integer integer = typeNumMap.get(fieldName); + if (integer != null) { + integer += 1; + } else { + integer = 1; + } + typeNumMap.put(fieldName, integer); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java index ca96cbb65..7b705f860 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.bigdevice.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -18,6 +19,7 @@ import com.zhgd.xmgl.modules.bigdevice.entity.dto.TowerDataInfoDTO; import com.zhgd.xmgl.modules.bigdevice.entity.vo.DevWorkerVO; import com.zhgd.xmgl.modules.bigdevice.entity.vo.DriverVO; import com.zhgd.xmgl.modules.bigdevice.entity.vo.TowerAndDataInfoVO; +import com.zhgd.xmgl.modules.bigdevice.entity.vo.TowerNumAndAlarmCount; import com.zhgd.xmgl.modules.bigdevice.mapper.*; import com.zhgd.xmgl.modules.bigdevice.service.ITowerService; import com.zhgd.xmgl.modules.bigdevice.service.ITowerVisualizeService; @@ -72,6 +74,8 @@ public class TowerServiceImpl extends ServiceImpl implements private ISystemUserService systemUserService; @Autowired private IMqttSender mqttSender; + @Autowired + private TowerViolationMapper towerViolationMapper; @Autowired @@ -280,15 +284,31 @@ public class TowerServiceImpl extends ServiceImpl implements } @Override - public Map selectTowerNumAndAlarmCount(Map map) { - Map data = new HashMap<>(); - Map devCount = towerMapper.selectTowerNumCount(map); - Map currentAlarmCount = towerAlarmMapper.selectCurrentAlarmCount(map); + public TowerNumAndAlarmCount selectTowerNumAndAlarmCount(Map map) { + Map dataMap = new HashMap<>(); + Map devCountMap = towerMapper.selectTowerNumCount(map); + Map currentAlarmCountMap = towerAlarmMapper.selectCurrentAlarmCount(map); + Map yesterdaySameTimeAlarmCountMap = towerAlarmMapper.selectYesterdaySameTimeAlarmCount(map); Integer faultNum = towerFaultMapper.selectCurrentFaultCount(map); - data.put("devCount", devCount); - data.put("alarmCount", currentAlarmCount); - data.put("faultNum", faultNum); - return data; + dataMap.put("devCount", devCountMap); + //报警总数 + dataMap.put("alarmCount", currentAlarmCountMap); + //故障总数 + dataMap.put("faultNum", faultNum); + List towerList = towerMapper.selectTowerList(map); + List towerBeanList = towerList.stream().map(e -> BeanUtil.toBeanIgnoreCase(e, Tower.class, true)).collect(Collectors.toList()); + dataMap.put("deviceList", towerBeanList); + TowerNumAndAlarmCount.AlarmCount violationCount = towerViolationMapper.selectViolation30DaysTodayYesterdayCount(map); + + TowerNumAndAlarmCount towerNumAndAlarmCount = BeanUtil.toBean(dataMap, TowerNumAndAlarmCount.class); + TowerNumAndAlarmCount.AlarmCount alarmCount = towerNumAndAlarmCount.getAlarmCount(); + alarmCount.setAlarmNumYesterdaySameTime(alarmCount.getAlarmNum() - MapUtils.getInteger(yesterdaySameTimeAlarmCountMap, "alarmNumYesterdaySameTime")); + alarmCount.setWarningNumYesterdaySameTime(alarmCount.getWarningNum() - MapUtils.getInteger(yesterdaySameTimeAlarmCountMap, "warningNumYesterdaySameTime")); + alarmCount.setTotalAlarmNumYesterdaySameTime(Integer.valueOf(alarmCount.getTotalAlarmNum()) - MapUtils.getInteger(yesterdaySameTimeAlarmCountMap, "totalAlarmNumYesterdaySameTime")); + alarmCount.setViolationNum(violationCount.getViolationNum()); + alarmCount.setViolationNumYesterdaySameTime(violationCount.getViolationNumYesterdaySameTime()); + alarmCount.setViolationNumBefore30Day(violationCount.getViolationNumBefore30Day()); + return towerNumAndAlarmCount; } @Override @@ -455,8 +475,14 @@ public class TowerServiceImpl extends ServiceImpl implements log.info("getRelatedInfo塔吊实时数据信息：{}", newData); - List driverList = tower.getDriverList().stream().map(driver -> new DriverVO(driver.getDriverName(), - driver.getDriverPhone(), driver.getCertificateNumber(), driver.getImageUrl())).collect(Collectors.toList()); + List driverList = tower.getDriverList().stream().map(driver -> { + DriverVO driverVO = new DriverVO(); + driverVO.setWorkerName(driver.getDriverName()); + driverVO.setPhoneNumber(driver.getDriverPhone()); + driverVO.setSpecialCertificateNumber(driver.getCertificateNumber()); + driverVO.setImageUrl(driver.getImageUrl()); + return driverVO; + }).collect(Collectors.toList()); DevWorkerVO devWorker = new DevWorkerVO(tower.getDevName(), tower.getDevSn(), tower.getRegistNo(), tower.getFactoryName(), null, driverList); diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java index 8fec561f8..fa27737e7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java @@ -204,7 +204,7 @@ public class ProjectController { result.error500(MessageUtil.get("notFindErr")); } else { boolean ok = projectService.update(project, queryWrapper); - redisRepository.del("projectInfoBySn:" + projectSn); + redisRepository.del("projectInfoBySn:" + projectEntity.getProjectSn()); if (ok) { result.successMsg(MessageUtil.get("editSucess")); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/BIMProgressTaskRqBody.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/BIMProgressTaskRqBody.java index 5453a1fca..34ce0f874 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/BIMProgressTaskRqBody.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/BIMProgressTaskRqBody.java @@ -42,4 +42,10 @@ public class BIMProgressTaskRqBody { * sign 是 String 校验码-->例如："sign": "842e133f81eb3506f60877652000a9fa" */ private String sign; + /** + * 特殊的值： + * project=1 是金融城那个（原来的中建四局） + * project=2 是坪山沙湖那个 + */ + private Integer projectId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/AsyBim.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/AsyBim.java index ec57ae7e1..4970585ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/AsyBim.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/AsyBim.java @@ -4,6 +4,8 @@ import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; import com.zhgd.xmgl.modules.project.entity.BIMProgressTaskRqBody; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; @@ -15,19 +17,17 @@ import java.util.HashMap; @Component @Slf4j public class AsyBim { - //测试 - //String ipPort = "http://47.105.67.193:8086"; - - //生产 - String ipPort = "http://124.71.79.109:8086"; + @Value("${bimProgressIpPort:}") + private String bimProgressIpPort; @Async("bimExecutor") public void asynAddProgressTask(BIMProgressTaskRqBody bimProgressTaskRqBody) { - String url = ipPort + "/Other/SaveProgress"; - String body = JSON.toJSONString(bimProgressTaskRqBody); - log.info("http调用bim保存进度：url：{},body：{}", url, body); - String rs = HttpUtil.post(url, body); - log.info("http调用bim保存进度结果：{}", rs); + if (StringUtils.isNotBlank(bimProgressIpPort)) { + String url = bimProgressIpPort + "/Other/SaveProgress"; + String body = JSON.toJSONString(bimProgressTaskRqBody); + log.info("http调用bim保存进度：url：{},body：{}", url, body); + String rs = HttpUtil.post(url, body); + log.info("http调用bim保存进度结果：{}", rs); /* 结果： { @@ -57,29 +57,30 @@ public class AsyBim {     } } */ + } } @Async("bimExecutor") public void asynDeleteProgressTask(String floor, String major) { - String url = ipPort + "/Other/DeleteProgress?floor=" + floor + "&major=" + major; - log.info("http调用bim删除进度：url：{}", url); - String rs = HttpUtil.post(url, new HashMap<>()); - log.info("http调用bim删除进度结果：{}", rs); - /* - 结果： - { -     "code": 200, -     "message": "操作成功", -    "data": 1  - } + if (StringUtils.isNotBlank(bimProgressIpPort)) { + String url = bimProgressIpPort + "/Other/DeleteProgress?floor=" + floor + "&major=" + major; + log.info("http调用bim删除进度：url：{}", url); + String rs = HttpUtil.post(url, new HashMap<>()); + log.info("http调用bim删除进度结果：{}", rs); + /* + 结果： + { +     "code": 200, +     "message": "操作成功", +    "data": 1  + } - { -     "code": 500, -     "message": "操作失败", -    "data": 1 + { +     "code": 500, +     "message": "操作失败", +    "data": 1 + } + */ } - */ } - - } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java index 36fed8957..37d2756b9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java @@ -94,7 +94,7 @@ public class ProgressTaskServiceImpl extends ServiceImpl deleteList = getBimTasksByProgressTasks(progressTasks); if (CollUtil.isNotEmpty(deleteList)) { @@ -108,7 +108,7 @@ public class ProgressTaskServiceImpl extends ServiceImpl bimProgressTaskRqBodies = getBimTasksByProgressTasks(progressTasks); if (CollUtil.isNotEmpty(bimProgressTaskRqBodies)) { @@ -400,7 +400,7 @@ public class ProgressTaskServiceImpl extends ServiceImpl progressTasks = progressTaskMapper.selectList(new LambdaQueryWrapper<>()); List bimTasksByProgressTasks = getBimTasksByProgressTasks(progressTasks); if (CollUtil.isNotEmpty(bimTasksByProgressTasks)) { diff --git a/src/main/java/com/zhgd/xmgl/util/ProfileJudgeUtil.java b/src/main/java/com/zhgd/xmgl/util/ProfileJudgeUtil.java index 3a3817455..f473b489d 100644 --- a/src/main/java/com/zhgd/xmgl/util/ProfileJudgeUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/ProfileJudgeUtil.java @@ -60,6 +60,15 @@ public class ProfileJudgeUtil { return "zjsj".equals(activeProfile); } + /** + * 是否中建四局环境 + * + * @return + */ + public boolean isZjsj() { + return Stream.of("zjsj-gsx", "zjsj").anyMatch(s -> s.equals(activeProfile)); + } + /** * 是否云联万物生产环境 * diff --git a/src/main/resources/application-temp-init-gsx.properties b/src/main/resources/application-temp-init-gsx.properties new file mode 100644 index 000000000..e1da82826 --- /dev/null +++ b/src/main/resources/application-temp-init-gsx.properties @@ -0,0 +1,74 @@ +#http.port=30250 +http.port=45232 +#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_temp?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) +spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==) +server.port=30013 +#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 diff --git a/src/main/resources/application-test-gsx.properties b/src/main/resources/application-test-gsx.properties new file mode 100644 index 000000000..8515036c0 --- /dev/null +++ b/src/main/resources/application-test-gsx.properties @@ -0,0 +1,74 @@ +#http.port=30250 +http.port=45732 +#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-test?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) +spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==) +server.port=30014 +#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 diff --git a/src/main/resources/application-zjsj-gsx.properties b/src/main/resources/application-zjsj-gsx.properties index d5053c423..72d81659e 100644 --- a/src/main/resources/application-zjsj-gsx.properties +++ b/src/main/resources/application-zjsj-gsx.properties @@ -71,4 +71,6 @@ 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 \ No newline at end of file +high_formwork.netty.port=15333 +#同步bim进度管理的IP端口号 +bimProgressIpPort=http://47.105.67.193:8086 diff --git a/src/main/resources/dll/libarcsoft_face.so b/src/main/resources/dll/libarcsoft_face.so new file mode 100644 index 000000000..bd6f21ca5 Binary files /dev/null and b/src/main/resources/dll/libarcsoft_face.so differ diff --git a/src/main/resources/dll/libarcsoft_face_engine.dll b/src/main/resources/dll/libarcsoft_face_engine.dll index 67f4642c7..be70ea92b 100644 Binary files a/src/main/resources/dll/libarcsoft_face_engine.dll and b/src/main/resources/dll/libarcsoft_face_engine.dll differ diff --git a/src/main/resources/dll/libarcsoft_face_engine.so b/src/main/resources/dll/libarcsoft_face_engine.so new file mode 100644 index 000000000..47dcddd73 Binary files /dev/null and b/src/main/resources/dll/libarcsoft_face_engine.so differ diff --git a/src/main/resources/dll/libarcsoft_face_engine_jni.dll b/src/main/resources/dll/libarcsoft_face_engine_jni.dll index 1b83b50e5..9adf835f0 100644 Binary files a/src/main/resources/dll/libarcsoft_face_engine_jni.dll and b/src/main/resources/dll/libarcsoft_face_engine_jni.dll differ diff --git a/src/main/resources/dll/libarcsoft_face_engine_jni.so b/src/main/resources/dll/libarcsoft_face_engine_jni.so new file mode 100644 index 000000000..5d1a84771 Binary files /dev/null and b/src/main/resources/dll/libarcsoft_face_engine_jni.so differ