Skip to content

A
amos-boot-biz
Commit 435527b6 authored by maoying's avatar maoying
Browse files
Options

Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

parents c88d394f 72074b11
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 149 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/BigScreen1VO.java
View file @ 435527b6
...@@ -15,5 +15,6 @@ public class BigScreen1VO { ...@@ -15,5 +15,6 @@ public class BigScreen1VO {
private List<Map<String, Object>> usrSignInfo; private List<Map<String, Object>> usrSignInfo;
private List<Map<String, Object>> usrSignInfoByCode;
// private Integer teamNum; // private Integer teamNum;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java
View file @ 435527b6
...@@ -48,4 +48,6 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> { ...@@ -48,4 +48,6 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
Map<String, Object> getFireForceInfoByCode(@Param("bizOrgCode") String bizOrgCode); Map<String, Object> getFireForceInfoByCode(@Param("bizOrgCode") String bizOrgCode);
List<Map<String, Object>> getStationSignInfo(@Param("bizOrgCode") String bizOrgCode); List<Map<String, Object>> getStationSignInfo(@Param("bizOrgCode") String bizOrgCode);
List<Map<String, Object>> getUsrSignInfoByBizOrgCode(@Param("bizOrgCode") String bizOrgCode);
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml
View file @ 435527b6
...@@ -265,12 +265,14 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr ...@@ -265,12 +265,14 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
</select> </select>
<select id="getPersonByCodes" resultType="com.yeejoin.amos.boot.module.common.api.entity.Firefighters"> <select id="getPersonByCodes" resultType="com.yeejoin.amos.boot.module.common.api.entity.Firefighters">
select * from cb_firefighters where select cf.employee_number, cd.name as gender from cb_firefighters cf
employee_number in left join cb_data_dictionary cd on cf.gender = cd.code
where
cf.employee_number in
<foreach item="item" collection="list" index="index" open="(" separator="," close=")"> <foreach item="item" collection="list" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
and is_delete = 0 and cf.is_delete = 0
</select> </select>
<select id="exportToExcelNew" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFireExcelDto"> <select id="exportToExcelNew" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFireExcelDto">
select select
...@@ -505,100 +507,6 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr ...@@ -505,100 +507,6 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
</select> </select>
<select id="getStationSignInfo" resultType="java.util.Map"> <select id="getStationSignInfo" resultType="java.util.Map">
<!-- SELECT b.qualifiedNum, b.unQualifiedNum, (TRUNCATE ( abs(( b.qualifiedNum ) / IF (( b.totalNum = 0 ),-->
<!-- 1,-->
<!-- b.totalNum-->
<!-- )) * 100 ,2)) as qualifiedAbs-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- count( a.signCount &gt;= 8 OR NULL ) AS qualifiedNum,-->
<!-- count( 1 ) AS totalNum,-->
<!-- count( a.signCount &lt; 8 OR NULL ) AS unQualifiedNum-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- si.`code`,-->
<!-- count( DISTINCT cs.user_id ) AS signCount-->
<!-- FROM-->
<!-- idx_biz_station_info si-->
<!-- LEFT JOIN cb_org_usr ou ON ou.`code` = si.`code`-->
<!-- AND ou.is_delete = 0-->
<!-- LEFT JOIN cb_sign cs ON cs.biz_org_code = ou.biz_org_code-->
<!-- AND cs.date LIKE CONCAT( DATE_FORMAT( now(), '%Y-%m' ), '%' )-->
<!-- <where>-->
<!-- <if test="companyCode != null and companyCode != ''">-->
<!-- si.`code` = #{companyCode}-->
<!-- </if>-->
<!-- </where>-->
<!-- GROUP BY-->
<!-- si.`code`-->
<!-- ) a-->
<!-- ) b-->
<!-- SELECT-->
<!-- sum( c.isNormal ) AS qualifiedNum,-->
<!-- (-->
<!-- count( 1 ) - sum( c.isNormal )) AS unQualifiedNum,-->
<!-- (-->
<!-- TRUNCATE (-->
<!-- abs(-->
<!-- sum( c.isNormal ) /-->
<!-- IF-->
<!-- (( count( 1 ) = 0 ), 1, count( 1 ) )) * 100,-->
<!-- 2-->
<!-- )) AS qualifiedAbs-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- si.`code`,-->
<!-- CASE-->
<!-- WHEN count( b.`date` IS NOT NULL OR NULL ) = DATEDIFF(-->
<!-- DATE_ADD( CURDATE(), INTERVAL 1 DAY ),-->
<!-- DATE_ADD( curdate(), INTERVAL - DAY ( curdate()) + 1 DAY )) THEN-->
<!-- 1 ELSE 0-->
<!-- END AS isNormal-->
<!-- FROM-->
<!-- idx_biz_station_info si-->
<!-- LEFT JOIN (-->
<!-- SELECT-->
<!-- *-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- t.date,-->
<!-- count( DISTINCT cs.user_id ) AS num,-->
<!-- si.`code`-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- DATE_ADD( DATE_ADD( CURDATE(), INTERVAL - 1 DAY ), INTERVAL @s DAY ) AS date,-->
<!-- @s := @s - 1 AS `index`-->
<!-- FROM-->
<!-- mysql.help_topic,-->
<!-- ( SELECT @s := 1 ) temp-->
<!-- WHERE-->
<!-- @s > DATEDIFF( date_add( curdate(), INTERVAL - DAY ( curdate()) + 1 DAY ), CURDATE() )) t-->
<!-- LEFT JOIN cb_sign cs ON cs.date = t.date-->
<!-- LEFT JOIN cb_org_usr ou ON ou.`biz_org_code` = cs.`biz_org_code`-->
<!-- AND ou.is_delete = 0-->
<!-- LEFT JOIN idx_biz_station_info si ON si.`code` = ou.`code`-->
<!-- GROUP BY-->
<!-- t.date,-->
<!-- si.`code`-->
<!-- ) a-->
<!-- WHERE-->
<!-- num &gt;= 8-->
<!-- ) b ON b.`code` = si.`code`-->
<!-- <where>-->
<!-- <if test="bizOrgCode != null and bizOrgCode != ''">-->
<!-- si.`code` = #{bizOrgCode}-->
<!-- </if>-->
<!-- </where>-->
<!-- GROUP BY-->
<!-- si.`code`-->
<!-- ) c-->
SELECT SELECT
sum( c.isNormal ) AS qualifiedNum, sum( c.isNormal ) AS qualifiedNum,
( (
...@@ -644,7 +552,7 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr ...@@ -644,7 +552,7 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
WHERE WHERE
@s > DATEDIFF( date_add( curdate(), INTERVAL - DAY ( curdate()) + 1 DAY ), CURDATE() )) t @s > DATEDIFF( date_add( curdate(), INTERVAL - DAY ( curdate()) + 1 DAY ), CURDATE() )) t
LEFT JOIN cb_sign cs ON cs.date = t.date LEFT JOIN cb_sign cs ON cs.date = t.date
LEFT JOIN cb_org_usr ou ON ou.`biz_org_code` = cs.`biz_org_code` LEFT JOIN cb_org_usr ou ON ou.`amos_org_id` = cs.`user_id`
AND ou.is_delete = 0 AND ou.is_delete = 0
LEFT JOIN idx_biz_station_info si ON si.`code` = ou.`code` LEFT JOIN idx_biz_station_info si ON si.`code` = ou.`code`
GROUP BY GROUP BY
...@@ -658,11 +566,35 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr ...@@ -658,11 +566,35 @@ LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
AND is_delete = 0 AND is_delete = 0
<where> <where>
<if test="bizOrgCode != null and bizOrgCode != ''"> <if test="bizOrgCode != null and bizOrgCode != ''">
ou1.`biz_org_code` = #{bizOrgCode} ou1.`biz_org_code` like concat(#{bizOrgCode}, '%')
</if> </if>
</where> </where>
GROUP BY GROUP BY
si.`code` si.`code`
) c ) c
</select> </select>
<select id="getUsrSignInfoByBizOrgCode" resultType="java.util.Map">
SELECT
count( 1 ) AS total,
count( DISTINCT cs.user_id ) AS qualifiedNum,
(
count( 1 ) - count( DISTINCT cs.user_id )) AS unQualifiedNum,
(TRUNCATE (
abs(
count( DISTINCT cs.user_id ) /
IF
(( count( 1 ) = 0 ), 1, count( 1 ) )) * 100,
2
)) as qualifiedAbs
FROM
cb_org_usr u
LEFT JOIN cb_sign cs ON cs.user_id = u.amos_org_id
WHERE
u.is_delete = 0
AND u.biz_org_type = 'PERSON'
<if test="bizOrgCode != null and bizOrgCode != ''">
AND u.`biz_org_code` LIKE concat(#{bizOrgCode}, '%')
</if>
</select>
</mapper> </mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @ 435527b6
...@@ -692,7 +692,7 @@ GROUP BY ...@@ -692,7 +692,7 @@ GROUP BY
max(case field_code when 'nation' then field_value end) nation, max(case field_code when 'nation' then field_value end) nation,
max(case field_code when 'birthdayTime' then field_value end) birthdayTime, max(case field_code when 'birthdayTime' then field_value end) birthdayTime,
max(case field_code when 'maritalStatus' then field_value end) maritalStatus, max(case field_code when 'maritalStatus' then field_value end) maritalStatus,
max(case field_code when 'nativePlace' then field_value_lable end) nativePlace, max(case field_code when 'nativePlace' then field_value_label end) nativePlace,
max(case field_code when 'nativePlaceVal' then field_value end) nativePlaceVal, max(case field_code when 'nativePlaceVal' then field_value end) nativePlaceVal,
max(case field_code when 'politicalOutlook' then field_value end) politicalOutlook, max(case field_code when 'politicalOutlook' then field_value end) politicalOutlook,
max(case field_code when 'residenceDetails' then field_value_label end) residenceDetails, max(case field_code when 'residenceDetails' then field_value_label end) residenceDetails,
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/SignMapper.xml
View file @ 435527b6
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
cb_sign sign cb_sign sign
<where> <where>
<if test="dto.name!=null and dto.name!=''"> <if test="dto.name!=null and dto.name!=''">
and sign.`name` like CONCAT(#{dto.name},'%') and sign.`name` like CONCAT('%',#{dto.name},'%')
</if> </if>
<if test="dto.type!=null and dto.type!=''"> <if test="dto.type!=null and dto.type!=''">
and sign.type=#{dto.type} and sign.type=#{dto.type}
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
and sign.sign_time >= #{dto.signTimeBIGGER} and sign.sign_time >= #{dto.signTimeBIGGER}
</if> </if>
<if test="dto.bizOrgName!=null and dto.bizOrgName!=''"> <if test="dto.bizOrgName!=null and dto.bizOrgName!=''">
and sign.biz_org_Name like CONCAT(#{dto.bizOrgName},'%') and sign.biz_org_Name like CONCAT('%',#{dto.bizOrgName},'%')
</if> </if>
<if test="dto.signTimeLESS!=null and dto.signTimeLESS!=''"> <if test="dto.signTimeLESS!=null and dto.signTimeLESS!=''">
and #{dto.signTimeLESS} >= sign.sign_time and #{dto.signTimeLESS} >= sign.sign_time
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java
View file @ 435527b6
...@@ -17,6 +17,7 @@ import org.springframework.beans.BeanUtils; ...@@ -17,6 +17,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.annotation.Condition; import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator; import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
...@@ -228,9 +229,16 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi ...@@ -228,9 +229,16 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public PeopleInfoDto updatePeopleById(PeopleInfoDto peopleInfoDto, Long id) { public PeopleInfoDto updatePeopleById(PeopleInfoDto peopleInfoDto, Long id) {
// 1.动态表单 // 1.动态表单
AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(peopleInfoDto.getFirefighters().getAmosUserId()).getResult();
peopleInfoDto.getFirefighters().setAmosName(amosUser.getRealName()); if(!ValidationUtil.isEmpty(peopleInfoDto.getFirefighters().getAmosUserId())) {
AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(peopleInfoDto.getFirefighters().getAmosUserId()).getResult();
peopleInfoDto.getFirefighters().setAmosName(amosUser.getRealName());
} else {
peopleInfoDto.getFirefighters().setAmosUserId(null);
peopleInfoDto.getFirefighters().setAmosName(null);
}
OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters()); OrgUsr orgUsr = orgUsrService.peopleSaveOrgUsr(peopleInfoDto.getFirefighters());
OrgPersonDto orgPersonDto = new OrgPersonDto(); OrgPersonDto orgPersonDto = new OrgPersonDto();
BeanUtils.copyProperties(orgUsr, orgPersonDto); BeanUtils.copyProperties(orgUsr, orgPersonDto);
List<DynamicFormInstance> dynamicFormInstances = orgUsrService.dynamicFormColumn(peopleInfoDto.getFirefighters(), false); List<DynamicFormInstance> dynamicFormInstances = orgUsrService.dynamicFormColumn(peopleInfoDto.getFirefighters(), false);
...@@ -309,6 +317,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi ...@@ -309,6 +317,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
// bigScreen1VO.setFirefightersInfo(fireForceInfoByCode); // bigScreen1VO.setFirefightersInfo(fireForceInfoByCode);
List<Map<String, Object>> stationSignInfo = firefightersMapper.getStationSignInfo(bizOrgCode); List<Map<String, Object>> stationSignInfo = firefightersMapper.getStationSignInfo(bizOrgCode);
bigScreen1VO.setUsrSignInfo(stationSignInfo); bigScreen1VO.setUsrSignInfo(stationSignInfo);
List<Map<String, Object>> usrSignInfoByBizOrgCode = firefightersMapper.getUsrSignInfoByBizOrgCode(bizOrgCode);
bigScreen1VO.setUsrSignInfoByCode(usrSignInfoByBizOrgCode);
return bigScreen1VO; return bigScreen1VO;
} }
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BigScreenController.java
View file @ 435527b6
package com.yeejoin.equipmanage.controller; package com.yeejoin.equipmanage.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.equipmanage.common.utils.CommonPageable;
import com.yeejoin.equipmanage.common.utils.CommonResponseUtil; import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
import com.yeejoin.equipmanage.common.utils.DateUtils;
import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.common.vo.BigScreenVo; import com.yeejoin.equipmanage.common.vo.BigScreenVo;
import com.yeejoin.equipmanage.config.PersonIdentify;
import com.yeejoin.equipmanage.fegin.IotFeign;
import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
import com.yeejoin.equipmanage.service.IFireFightingSystemService; import com.yeejoin.equipmanage.service.IFireFightingSystemService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@RestController @RestController
@Api(tags = "一张图大屏API") @Api(tags = "一张图大屏API")
@RequestMapping(value = "/bigScreen", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/bigScreen", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public class BigScreenController { public class BigScreenController extends AbstractBaseController {
@Autowired @Autowired
private IFireFightingSystemService iFireFightingSystemService; private IFireFightingSystemService iFireFightingSystemService;
@Autowired
private FireFightingSystemMapper fireFightingSystemMapper;
@Autowired
private IotFeign iotFeign;
@GetMapping(value = "/list") @GetMapping(value = "/list")
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "系统、消防水池、工业水池、水源总容积、消防车辆(接口弃用)", notes = "系统、消防水池、工业水池、水源总容积、消防车辆") @ApiOperation(httpMethod = "GET", value = "系统、消防水池、工业水池、水源总容积、消防车辆(接口弃用)", notes = "系统、消防水池、工业水池、水源总容积、消防车辆")
...@@ -36,4 +61,91 @@ public class BigScreenController { ...@@ -36,4 +61,91 @@ public class BigScreenController {
public ResponseModel<BigScreenVo> getCarInfo(@RequestParam(required = false, value = "companyCode") String companyCode) { public ResponseModel<BigScreenVo> getCarInfo(@RequestParam(required = false, value = "companyCode") String companyCode) {
return CommonResponseUtil.success(iFireFightingSystemService.getCarInfo(companyCode)); return CommonResponseUtil.success(iFireFightingSystemService.getCarInfo(companyCode));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "水源信息列表")
@GetMapping("/getWaterInfo")
public ResponseModel getWaterInfo(CommonPageable commonPageable, @RequestParam(value = "companyCode",required = false)String companyCode) {
if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1);
}
Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
return CommonResponseUtil.success(iFireFightingSystemService.getWaterInfo(page, companyCode, null));
}
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "稳压泵列表信息")
@GetMapping("/getPressurePumpInfo")
public ResponseModel getPressurePumpInfo(CommonPageable commonPageable,@RequestParam(required = false, value = "companyCode")String companyCode) {
if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1);
}
Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
String bizOrgCode = null;
if (StringUtil.isNotEmpty(companyCode)) {
bizOrgCode = fireFightingSystemMapper.queryByCompanyCode(companyCode);
}
Page<Map<String, Object>> pressurePumpInfo = fireFightingSystemMapper.getPressurePumpInfo(page, bizOrgCode, null);
pressurePumpInfo.getRecords().stream().map(item -> {
item.put("startAndStopNum", 0);
item.put("update_time", "--");
item.put("equipment_index_name", "--");
String prefix = null;
String suffix = null;
String iotCode = item.get("iot_code").toString();
if (iotCode.length() > 8) {
prefix = iotCode.substring(0, 8);
suffix = iotCode.substring(8);
} else {
throw new BadRequest("装备物联编码错误，请确认！");
}
String nowStrLong = DateUtils.getNowStrLong();
Date startDate = DateUtils.dateAddMinutes(null, -4);
String startDateStr = DateUtils.convertDateToString(startDate, DateUtils.DATE_TIME_PATTERN);
ResponseModel entity1 = null;
ResponseModel entity2 = null;
try {
entity1 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, "FHS_PressurePump_Start");
entity2 = iotFeign.selectList(getAppKey(), getProduct(), getToken(), startDateStr, nowStrLong, prefix, suffix, "FHS_PressurePump_Stop");
} catch (Exception e) {
e.printStackTrace();
}
if (200 == entity1.getStatus() && !ObjectUtils.isEmpty(entity1.getResult()) &&
200 == entity2.getStatus() && !ObjectUtils.isEmpty(entity2.getResult())) {
String json1 = JSON.toJSONString(entity1.getResult());
List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
String json2 = JSON.toJSONString(entity1.getResult());
List<Map<String, String>> listObject2 = (List<Map<String, String>>) JSONArray.parse(json2);
int num = listObject1.size() + listObject2.size();
item.put("startAndStopNum", num);
}
item.put("stateDesc", (Integer) item.get("startAndStopNum") <= 1 ? "1" : "0");
item.put("normalNum", (Integer) item.get("startAndStopNum") <= 1 ? 1 : 0);
item.put("unNormalNum", (Integer) item.get("startAndStopNum") <= 1 ? 0 : 1);
Map<String, String> stateMap = fireFightingSystemMapper.queryPressureNowStateBySpecificId((Long) item.get("id"));
if (!ObjectUtils.isEmpty(stateMap) && stateMap.containsKey("update_date") && stateMap.containsKey("equipment_index_name")) {
item.put("update_time", String.valueOf(stateMap.get("update_date")).replaceAll("T", " "));
item.put("equipment_index_name", stateMap.get("equipment_index_name"));
}
return item;
}).collect(Collectors.toList());
return CommonResponseUtil.success(pressurePumpInfo);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "系统今日告警信息列表")
@GetMapping("/getSystemInfo")
public ResponseModel getSystemInfo(CommonPageable commonPageable, @RequestParam(value = "companyCode",required = false)String companyCode) {
if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1);
}
Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
return CommonResponseUtil.success(iFireFightingSystemService.getSystemInfo(page, companyCode, null));
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
View file @ 435527b6
...@@ -306,6 +306,13 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE ...@@ -306,6 +306,13 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
* @return * @return
*/ */
Page<Map<String, Object>> getWaterInfo(Page page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode); Page<Map<String, Object>> getWaterInfo(Page page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode);
/**
* 获取系统今日告警信息
*
* @param bizOrgCode
* @return
*/
Page<Map<String, Object>> getSystemInfo(Page page, @Param("bizOrgCode") String bizOrgCode, @Param("systemCode") String systemCode);
/** /**
* 获取系统名称及该系统工作状态 * 获取系统名称及该系统工作状态
...@@ -490,7 +497,8 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE ...@@ -490,7 +497,8 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
@Param("indicator") List<String> indicator); @Param("indicator") List<String> indicator);
Map<String, Object> selectWeekSummarize(@Param("systemId") String systemId, Map<String, Object> selectWeekSummarize(@Param("systemId") String systemId,
@Param("startDate") String startDate, @Param("startDate") String startDate,
@Param("endDate") String endDate); @Param("endDate") String endDate,
@Param("indicator") List<String> indicator);
List<Map<String, Object>> selectWeekEquipEchart(@Param("systemCode") String systemCode, List<Map<String, Object>> selectWeekEquipEchart(@Param("systemCode") String systemCode,
@Param("startDate") String startDate, @Param("startDate") String startDate,
...@@ -508,14 +516,14 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE ...@@ -508,14 +516,14 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
Map<String, Object> selectDaySummarize(@Param("systemId") String systemId, Map<String, Object> selectDaySummarize(@Param("systemId") String systemId,
@Param("startDate") String startDate, @Param("startDate") String startDate,
@Param("endDate") String endDate); @Param("endDate") String endDate,
@Param("indicator") List<String> indicator);
List<Map<String, Object>> selectDayEquipEchart(@Param("systemCode") String systemCode, List<Map<String, Object>> selectDayEquipEchart(@Param("systemCode") String systemCode,
@Param("startDate") String startDate, @Param("startDate") String startDate,
@Param("endDate") String endDate); @Param("endDate") String endDate);
List<Map<String, Object>> selectDayEchart(@Param("systemCode") String systemCode, List<Map<String, Object>> selectDayEchart(@Param("systemId") String systemId,
@Param("startDate") String startDate, @Param("date") String date,
@Param("endDate") String endDate,
@Param("indicator") List<String> indicator); @Param("indicator") List<String> indicator);
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java
View file @ 435527b6
...@@ -280,5 +280,8 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE ...@@ -280,5 +280,8 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
String iotDayReport(String bizOrgCode, String startDate, String endDate); String iotDayReport(String bizOrgCode, String startDate, String endDate);
Page<Map<String, Object>> getWaterInfo(Page page, String companyCode, String systemCode);
Page<Map<String, Object>> getSystemInfo(Page page, String companyCode, String systemCode);
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
View file @ 435527b6
...@@ -556,7 +556,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i ...@@ -556,7 +556,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
private List<BuildingTreeVo> getChildren(Long parentId, List<BuildingTreeVo> allListVo) { private List<BuildingTreeVo> getChildren(Long parentId, List<BuildingTreeVo> allListVo) {
List<BuildingTreeVo> children = new ArrayList<>(); List<BuildingTreeVo> children = new ArrayList<>();
allListVo.stream().filter(a -> a.getParentId().equals(String.valueOf(parentId))).forEach(s -> { allListVo.stream().filter(a -> !ObjectUtils.isEmpty(a.getParentId()) && a.getParentId().equals(String.valueOf(parentId))).forEach(s -> {
s.setChildren(this.getChildren(s.getInstanceId(), allListVo)); s.setChildren(this.getChildren(s.getInstanceId(), allListVo));
s.setDetailPaneApi(address); s.setDetailPaneApi(address);
s.setApiUrl(apiUrl); s.setApiUrl(apiUrl);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ 435527b6
...@@ -1716,15 +1716,43 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -1716,15 +1716,43 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
} }
// 总结 // 总结
Map<String, Object> summarize = fireFightingSystemMapper.selectWeekSummarize(valueOf(system.get("id")), startDate, endDate); Map<String, Object> summarize = fireFightingSystemMapper.selectWeekSummarize(valueOf(system.get("id")), startDate, endDate, indicatorList);
if (!ObjectUtils.isEmpty(summarize.get("contant"))) { // if (!ObjectUtils.isEmpty(summarize.get("contant"))) {
systemData.put("summarize", String.valueOf(summarize.get("contant"))); // systemData.put("summarize", String.valueOf(summarize.get("contant")));
} else { // } else {
systemData.put("summarize", ""); // systemData.put("summarize", "");
} // }
systemData.put("summarize", ObjectUtils.isEmpty(summarize.get("name"))?0:summarize.get("name")
+"设备总数"+(ObjectUtils.isEmpty(summarize.get("equipNum"))?0:summarize.get("equipNum"))
+"台，正常设备"+(ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"))
+"台，正常率"+(ObjectUtils.isEmpty(summarize.get("normalRate"))?0:summarize.get("normalRate"))
+"%，故障设备"+(ObjectUtils.isEmpty(summarize.get("faultNum"))?0:summarize.get("faultNum"))
+"台，故障率为"+(ObjectUtils.isEmpty(summarize.get("faultRate"))?0:summarize.get("faultRate"))
+"%，七日告警设备为"+(ObjectUtils.isEmpty(summarize.get("exepctionNum"))?0:summarize.get("exepctionNum"))
+"台，同比上周"+(ObjectUtils.isEmpty(summarize.get("status1"))?"增加":summarize.get("status1"))+(ObjectUtils.isEmpty(summarize.get("exepctionWOW"))?0:summarize.get("exepctionWOW"))
+"%，七日告警总数为"+(ObjectUtils.isEmpty(summarize.get("alarmNum"))?0:summarize.get("alarmNum"))
+"条，同比上周"+(ObjectUtils.isEmpty(summarize.get("status2"))?"增加":summarize.get("status2"))+(ObjectUtils.isEmpty(summarize.get("alarmWOW"))?0:summarize.get("alarmWOW"))
+"%。"
);
// echarts 图表 // echarts 图表
List<Map<String, Object>> mapList = fireFightingSystemMapper.selectWeekEquipEchart(valueOf(system.get("code")), startDate, endDate, indicatorList); //List<Map<String, Object>> mapList = fireFightingSystemMapper.selectWeekEquipEchart(valueOf(system.get("code")), startDate, endDate, indicatorList);
ArrayList<Map<String, Object>> mapList = new ArrayList<>();
HashMap<String, Object> dayEchartsDate = new HashMap<>();
dayEchartsDate.put("type","正常设备");
dayEchartsDate.put("value",ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"));
mapList.add(dayEchartsDate);
HashMap<String, Object> dayEchartsDate1 = new HashMap<>();
dayEchartsDate1.put("type","异常设备");
if (!ObjectUtils.isEmpty(summarize.get("equipNum")) || !ObjectUtils.isEmpty(summarize.get("normalNum"))){
dayEchartsDate1.put("value",Integer.parseInt(String.valueOf(summarize.get("equipNum")))
-Integer.parseInt(String.valueOf(summarize.get("normalNum"))));
}else {
dayEchartsDate1.put("value",0);
}
mapList.add(dayEchartsDate1);
String pieChart1 = ChartsUtils.pieChart(mapList, "故障设备类型占比"); String pieChart1 = ChartsUtils.pieChart(mapList, "故障设备类型占比");
systemData.put("pictureLeft", pieChart1); systemData.put("pictureLeft", pieChart1);
...@@ -1859,19 +1887,37 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -1859,19 +1887,37 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
} }
// 总结 // 总结
Map<String, Object> summarize = fireFightingSystemMapper.selectDaySummarize(valueOf(system.get("id")), startDate, endDate); Map<String, Object> summarize = fireFightingSystemMapper.selectDaySummarize(valueOf(system.get("id")), startDate, endDate, indicatorList);
if (!ObjectUtils.isEmpty(summarize.get("contant"))) { // if (!ObjectUtils.isEmpty(summarize.get("contant"))) {
systemData.put("summarize", String.valueOf(summarize.get("contant"))); // systemData.put("summarize", String.valueOf(summarize.get("contant")));
} else { // } else {
systemData.put("summarize", ""); // systemData.put("summarize", "");
} // }
systemData.put("summarize", ObjectUtils.isEmpty(summarize.get("name"))?0:summarize.get("name")+"设备总数"+(ObjectUtils.isEmpty(summarize.get("equipNum"))?0:summarize.get("equipNum"))
+"台，今日告警设备为"+(ObjectUtils.isEmpty(summarize.get("dayNum"))?0:summarize.get("dayNum"))+"台，告警总数为"+(ObjectUtils.isEmpty(summarize.get("alarmNum"))?0:summarize.get("alarmNum"))+
"条，正常设备"+(ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"))+"台，正常率"+(ObjectUtils.isEmpty(summarize.get("normalRate"))?0:summarize.get("normalRate"))+"%");
// echarts 图表 // echarts 图表
List<Map<String, Object>> mapList = fireFightingSystemMapper.selectDayEquipEchart(valueOf(system.get("code")), startDate, endDate); List<Map<String, Object>> mapList = fireFightingSystemMapper.selectDayEquipEchart(valueOf(system.get("code")), startDate, endDate);
String pieChart1 = ChartsUtils.pieChart(mapList, "故障设备类型占比"); String pieChart1 = ChartsUtils.pieChart(mapList, "故障设备类型占比");
systemData.put("pictureLeft", pieChart1); systemData.put("pictureLeft", pieChart1);
List<Map<String, Object>> dayEchart = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("code")), startDate, endDate, indicatorList); // List<Map<String, Object>> dayEcharts = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("id")), startDate, indicatorList);
ArrayList<Map<String, Object>> dayEchart = new ArrayList<>();
HashMap<String, Object> dayEchartsDate = new HashMap<>();
dayEchartsDate.put("type","正常设备");
dayEchartsDate.put("value",ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"));
dayEchart.add(dayEchartsDate);
HashMap<String, Object> dayEchartsDate1 = new HashMap<>();
dayEchartsDate1.put("type","异常设备");
if (!ObjectUtils.isEmpty(summarize.get("equipNum")) || !ObjectUtils.isEmpty(summarize.get("normalNum"))){
dayEchartsDate1.put("value",Integer.parseInt(String.valueOf(summarize.get("equipNum")))
-Integer.parseInt(String.valueOf(summarize.get("normalNum"))));
}else {
dayEchartsDate1.put("value",0);
}
dayEchart.add(dayEchartsDate1);
String pieChart2 = ChartsUtils.pieChart(dayEchart, "告警信息占比"); String pieChart2 = ChartsUtils.pieChart(dayEchart, "告警信息占比");
systemData.put("pictureRight", pieChart2); systemData.put("pictureRight", pieChart2);
...@@ -1917,4 +1963,22 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -1917,4 +1963,22 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
} }
return pdfUrlString; return pdfUrlString;
} }
@Override
public Page<Map<String, Object>> getWaterInfo(Page page, String companyCode, String systemCode) {
String bizOrgCode = null;
if (StringUtil.isNotEmpty(companyCode)) {
bizOrgCode = fireFightingSystemMapper.queryByCompanyCode(companyCode);
}
return fireFightingSystemMapper.getWaterInfo(page, bizOrgCode, null);
}
@Override
public Page<Map<String, Object>> getSystemInfo(Page page, String companyCode, String systemCode) {
String bizOrgCode = null;
if (StringUtil.isNotEmpty(companyCode)) {
bizOrgCode = fireFightingSystemMapper.queryByCompanyCode(companyCode);
}
return fireFightingSystemMapper.getSystemInfo(page, bizOrgCode, null);
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java
View file @ 435527b6
...@@ -445,10 +445,13 @@ public class FirefightersController extends BaseController { ...@@ -445,10 +445,13 @@ public class FirefightersController extends BaseController {
if (!ObjectUtils.isEmpty(fire)) { if (!ObjectUtils.isEmpty(fire)) {
//判断此消防人员所属队伍是否变换， //判断此消防人员所属队伍是否变换，
//获取用户已绑定车辆id、 //获取用户已绑定车辆id、
UserCar userCar = userCarService.selectByAmosUserId(Long.valueOf(firefighters.getFirefighters().getAmosUserId())); if(!ValidationUtil.isEmpty(firefighters.getFirefighters().getAmosUserId())) {
if(userCar!=null&&!userCar.getTeamId().equals(firefighters.getFirefighters().getFireTeamId()+"")){ UserCar userCar = userCarService.selectByAmosUserId(Long.valueOf(firefighters.getFirefighters().getAmosUserId()));
userCarService.delete(userCar); if(userCar!=null&&!userCar.getTeamId().equals(firefighters.getFirefighters().getFireTeamId()+"")){
userCarService.delete(userCar);
}
} }
firefighter.setSequenceNbr(fire.getSequenceNbr()); firefighter.setSequenceNbr(fire.getSequenceNbr());
firefighter.setOrgUsrId(peopleBasicInfoDto.getSequenceNbr()); firefighter.setOrgUsrId(peopleBasicInfoDto.getSequenceNbr());
firefighter.setEmployeeNumber(peopleBasicInfoDto.getPersonNumber()); firefighter.setEmployeeNumber(peopleBasicInfoDto.getPersonNumber());
...@@ -525,7 +528,7 @@ public class FirefightersController extends BaseController { ...@@ -525,7 +528,7 @@ public class FirefightersController extends BaseController {
map.put("jobTitle", e.getJobTitle()); map.put("jobTitle", e.getJobTitle());
map.put("bizOrgName", e.getBizOrgName()); map.put("bizOrgName", e.getBizOrgName());
map.put("bizOrgCode", e.getBizOrgCode()); map.put("bizOrgCode", e.getBizOrgCode());
map.put("amosUserId", e.getAmosUserId()); map.put("amosUserId", e.getOrgUsrId());
map.put("personnelPhotos", e.getPersonnelPhotos()); map.put("personnelPhotos", e.getPersonnelPhotos());
list.add(map); list.add(map);
}); });
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/SignController.java
View file @ 435527b6
...@@ -99,7 +99,7 @@ public class SignController extends BaseController { ...@@ -99,7 +99,7 @@ public class SignController extends BaseController {
public ResponseModel<SignDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<SignDto> selectOne(@PathVariable Long sequenceNbr) {
SignDto signDto = signServiceImpl.queryBySeq(sequenceNbr); SignDto signDto = signServiceImpl.queryBySeq(sequenceNbr);
QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<>(); QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("amos_org_id",signDto.getSignUserId()); queryWrapper.eq("sequence_nbr",signDto.getSignUserId());
queryWrapper.eq("is_delete",0); queryWrapper.eq("is_delete",0);
OrgUsr orgUsr = iOrgUsrService.getOne(queryWrapper); OrgUsr orgUsr = iOrgUsrService.getOne(queryWrapper);
try { try {
......
amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
View file @ 435527b6
...@@ -2667,25 +2667,7 @@ ...@@ -2667,25 +2667,7 @@
ALTER TABLE `wl_equipment_detail` ADD COLUMN `latitude` double(18,14) DEFAULT NULL COMMENT '纬度' ALTER TABLE `wl_equipment_detail` ADD COLUMN `latitude` double(18,14) DEFAULT NULL COMMENT '纬度'
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="ltw" id="2022-03-01">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group_column"/>
</preConditions>
<comment>插入动态表单数据 wl_form_group_column</comment>
<sql>
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000308', 'longitude', '经度', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000309', 'longitude', '经度', 'String', '132828674812', 'eq', b'0', 'pool', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000310', 'longitude', '经度', 'String', '132828674813', 'eq', b'0', 'fireRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000311', 'longitude', '经度', 'String', '132828674814', 'eq', b'0', 'rainRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000312', 'longitude', '经度', 'String', '132828674815', 'eq', b'0', 'fireFoamRoom', '2581805', '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000313', 'latitude', '纬度', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000314', 'latitude', '纬度', 'String', '132828674812', 'eq', b'0', 'pool', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000315', 'latitude', '纬度', 'String', '132828674813', 'eq', b'0', 'fireRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000316', 'latitude', '纬度', 'String', '132828674814', 'eq', b'0', 'rainRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000317', 'latitude', '纬度', 'String', '132828674815', 'eq', b'0', 'fireFoamRoom', '2581805', '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000318', 'address', '地址', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:01:04');
</sql>
</changeSet>
......
amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
View file @ 435527b6
...@@ -173,4 +173,24 @@ ...@@ -173,4 +173,24 @@
alter table `wl_equipment_detail` add column `delivery_date` datetime DEFAULT NULL COMMENT '投运日期'; alter table `wl_equipment_detail` add column `delivery_date` datetime DEFAULT NULL COMMENT '投运日期';
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="ltw" id="20220831-ltw2">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group_column"/>
</preConditions>
<comment>插入动态表单数据 wl_form_group_column</comment>
<sql>
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000308', 'longitude', '经度', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000309', 'longitude', '经度', 'String', '132828674812', 'eq', b'0', 'pool', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000310', 'longitude', '经度', 'String', '132828674813', 'eq', b'0', 'fireRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000311', 'longitude', '经度', 'String', '132828674814', 'eq', b'0', 'rainRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000312', 'longitude', '经度', 'String', '132828674815', 'eq', b'0', 'fireFoamRoom', '2581805', '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000313', 'latitude', '纬度', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000314', 'latitude', '纬度', 'String', '132828674812', 'eq', b'0', 'pool', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000315', 'latitude', '纬度', 'String', '132828674813', 'eq', b'0', 'fireRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000316', 'latitude', '纬度', 'String', '132828674814', 'eq', b'0', 'rainRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000317', 'latitude', '纬度', 'String', '132828674815', 'eq', b'0', 'fireFoamRoom', '2581805', '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000318', 'address', '地址', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000319', 'address', '地址', 'String', '132828674817', 'eq', b'0', 'r_fireControlRoom', '2581805', '2022-03-01 12:01:04');
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment