Skip to content

A
amos-boot-biz
Commit a03f81dd authored by KeYong's avatar KeYong
Browse files
Options

Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp

parents d342f5ef e949e37e
Hide whitespace changes
Inline Side-by-side
Showing with 386 additions and 138 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @ a03f81dd
......@@ -83,7 +83,7 @@ public class ControllerAop {
// 不需要添加请求头的接口
String[] url = new String[]{"/api/user/save/curCompany", "/jcs/command/lookHtmlText",
"/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
"/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage"};
"/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage","/jcs/excel/export/QDSJ"};
// 获取请求路径
for (String uri : url) {
if (request.getRequestURI().indexOf(uri) != -1) {
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PeopleBasicInfoDto.java
View file @ a03f81dd
......@@ -122,6 +122,9 @@ public class PeopleBasicInfoDto {
@ApiModelProperty(value = "身份证反面")
private String idReverse;
@ApiModelProperty(value = "岗位资质证书")
private String qualificationCertificate;
@ApiModelProperty(value = "更新时间")
@TableField(fill= FieldFill.UPDATE)
private Date updateTime;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @ a03f81dd
......@@ -71,12 +71,15 @@
<if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
</if>
<if test="map.amosOrgId != null and map.amosOrgId != '-1'">
AND u.amos_org_id like concat(#{map.amosOrgId}, '%')
<if test="map.amosOrgCode != null and map.amosOrgCode != ''">
AND u.amos_org_code like concat('%', #{map.amosOrgCode}, '%')
</if>
<if test="map.company != null and map.company != '-1'">
AND u.parent_id = #{map.company}
</if>
<if test="map.positionType != null and map.positionType != ''">
AND FIND_IN_SET(#{map.positionType},g.positionType)
</if>
GROUP BY
u.sequence_nbr ,
u.biz_org_name ,
......@@ -145,14 +148,14 @@
<if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
</if>
<if test="map.amosOrgCode != null and map.amosOrgCode != '-1'">
<if test="map.amosOrgCode != null and map.amosOrgCode != ''">
AND u.amos_org_code like concat('%',#{map.amosOrgCode}, '%')
</if>
<if test="map.company != null and map.company != '-1'">
AND u.parent_id = #{map.company}
</if>
<if test="map.positionType != null and map.positionType != ''">
AND AND FIND_IN_SET(#{positionType},g.positionType)
AND FIND_IN_SET(#{map.positionType},g.positionType)
</if>
GROUP BY
u.sequence_nbr ,
......@@ -164,7 +167,6 @@
<foreach collection="map.fieldsValue.keys" item="item">AND a.${item} = #{map.fieldsValue[${item}]}</foreach>
</if>
LIMIT #{map.pageNum}, #{map.pageSize}
</select>
<!--机场单位查询机构下所有子数据 2021-09-16 by litw -->
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/SignMapper.xml
View file @ a03f81dd
......@@ -76,8 +76,8 @@
) s group by date,bizOrgCode
</select>
<select id="queryPersonNum" resultType="java.lang.Integer">
select count(*) from cb_firefighters where fire_team_id in (
select sequence_nbr from cb_fire_team where biz_org_code = #{bizOgrCode} and type_code = '116'
) and is_delete = 0 AND now() > rec_date
select count(*) from cb_firefighters where biz_org_code = #{bizOgrCode} AND people_type = '1601'
AND is_delete = 0 AND now() > rec_date
</select>
</mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyPersonServiceImpl.java
View file @ a03f81dd
......@@ -10,6 +10,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonShiftDto;
import com.yeejoin.amos.boot.module.common.api.mapper.DutyPersonShiftMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java
View file @ a03f81dd
......@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
......@@ -149,6 +150,10 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
// 不存在值班数据则不查找 修改sql 方法去除 by kongfm 2021-09-14
public IPage<Map<String, Object>> pageListNew(int current, int size, String groupCode, String beginDate, String endDate) {
Map<String, String> params = this.getRequestParamMap();
if (!ObjectUtils.isEmpty(beginDate) && params.get("beginDate") == null) {
params.put("stratTime", beginDate);
params.put("endTime", endDate);
}
List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
Page page = new Page(current, size);
......
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 @ a03f81dd
......@@ -242,15 +242,12 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
//删除之前所在用户组
OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
if (!ValidationUtil.isEmpty(orgUsrAgencyUser) && amosUser != null ) {
List<String> groupIdsList = peopleInfoDto.getOrgUsrAgencyUser().getDataDictionaryList().stream().map(DataDictionary::getCode).distinct().collect(Collectors.toList());
String groupIds = String.join(",", groupIdsList);
if (!"".equals(groupIds) && null != groupIds) {
String[] ids = groupIds.split(",");
for (String gId : ids) {
Long groupId = Long.valueOf(gId);
Privilege.groupUserClient.deleteGroupUser(groupId,amosUser.getUserId());
}
for (String s : orgUsrAgencyUser.getGroupIds().split(",")) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("name", s);
queryWrapper.eq("type", "CB_USER_GROUP");
List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
Privilege.groupUserClient.deleteGroupUser(Long.valueOf(list.get(0).getCode()),amosUser.getUserId());
}
}
//同步更新或者创建平台用户
......@@ -261,18 +258,28 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
//删除cb_org_usr_agency_user中对应数据
if (!ValidationUtil.isEmpty(orgUsrAgencyUser)) {
orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
// 删除已经创建的管理员账号
FeignClientResult<AgencyUserModel> feignClientResult = Privilege.agencyUserClient
.queryByUserId(orgUsrAgencyUser.getAmosUserId());
if (feignClientResult != null) {
Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
}
}
//删除cb_org_usr相关字段
OrgUsr orgUsr1 = orgUsrMapper.queryBySequenceNbr(id.toString());
orgUsr1.setAmosOrgId("");
orgUsr1.setAmosOrgCode("");
orgUsrMapper.update(orgUsr1,new QueryWrapper<OrgUsr>().eq("sequence_nbr",id));
if(!ValidationUtil.isEmpty(orgUsr1)){
orgUsr1.setAmosOrgId("");
orgUsr1.setAmosOrgCode("");
orgUsrMapper.update(orgUsr1,new QueryWrapper<OrgUsr>().eq("sequence_nbr",id));
}
//删除cb_firefighters相关字段
Firefighters firefighters = firefightersMapper.selectOne(new QueryWrapper<Firefighters>().eq("org_usr_id", id));
firefighters.setAmosUserId("");
firefighters.setAmosName("");
firefightersMapper.update(firefighters,new QueryWrapper<Firefighters>().eq("org_usr_id", id));
Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
if(!ValidationUtil.isEmpty(firefighters)){
firefighters.setAmosUserId("");
firefighters.setAmosName("");
firefightersMapper.update(firefighters,new QueryWrapper<Firefighters>().eq("org_usr_id", id));
}
} else {
map = orgUsrService.savePlatformUser(orgUsr,peopleInfoDto,"update");
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ a03f81dd
......@@ -596,6 +596,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
String positionType = "";
if(req.containsKey("positionType")) {
positionType = req.get("positionType").toString();
map.put("positionType", positionType);
}
req.remove("pageSize");
......@@ -604,6 +605,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
req.remove("amosOrgId");
req.remove("company");
req.remove("positionType");
req.remove("bizOrgName");
map.put("fieldsValue", req);
map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
pageBean.setTotal(this.baseMapper.selectPersonListCount(map));
......@@ -651,7 +653,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
if(!positionType.equals("")) {
String positionTypeFine = positionType;
list = list.stream().filter(e-> !ValidationUtil.isEmpty(e.get("positionType")) && e.get("positionType").toString().contains(positionTypeFine)).collect(Collectors.toList());
list = list.stream().filter(e-> !ObjectUtils.isEmpty(e.get("positionType")) && String.valueOf(e.get("positionType")).contains(positionTypeFine)).collect(Collectors.toList());
}
/* Bug2652 根据名字和工号模糊查询失效 已添加模糊匹配 2021-09-01 陈召 结束 */
pageBean.setRecords(list);
......@@ -3048,7 +3050,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
String roleNameString = String.join(",", roleNameList);
List<RoleModel> userRoleList = allRoleList.stream().filter(r -> roleNameString.contains(r.getRoleName()))
.collect(Collectors.toList());
String appCode = "";
List<String> collect = peopleInfoDto.getOrgUsrAgencyUser().getDataDictionaryList().stream().map(DataDictionary::getTypeDesc).collect(Collectors.toList());
String appCode = String.join(",", collect);
String[] appCodes = appCode.split(",");
Collections.addAll(appCodesSet, appCodes);
userRoleList.forEach(r -> {
......@@ -3422,13 +3425,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
if (!ObjectUtils.isEmpty(orgUsrAgencyUser)) {
orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
//同步平台删除用户
AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(orgUsrAgencyUser.getAmosUserId()).getResult();
if (!ObjectUtils.isEmpty(amosUser)) {
Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
}
}
//同步平台删除用户
AgencyUserModel amosUser = Privilege.agencyUserClient.queryByUserId(orgUsrAgencyUser.getAmosUserId()).getResult();
if (!ObjectUtils.isEmpty(amosUser)) {
Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
}
/* bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 结束 */
try {
eSOrgUsrService.deleteById(id);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java
View file @ a03f81dd
......@@ -188,10 +188,31 @@ public class ConfigureController extends AbstractBaseController {
if (!CollectionUtils.isEmpty(fireCarInfoByWL.getRecords())) {
List<Map<String, Object>> records = fireCarInfoByWL.getRecords();
records.forEach(item -> {
String carId = item.get("id").toString();
Map<String, Object> fireCaStartBySeven = fireFightingSystemMapper.getFireCaStartBySeven(carId);
Object count = fireCaStartBySeven.get("count");
item.put("count",count.toString());
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 sevenDay = DateUtils.dateAddDays(null, -7);
String seven = DateUtils.convertDateToString(sevenDay, DateUtils.DATE_TIME_PATTERN);
ResponseModel sevenEntity = null;
try {
sevenEntity = iotFeign.selectList(getAppKey(), getProduct(), getToken(), seven, nowStrLong, prefix, suffix, "FireCar_Start");
} catch (Exception e) {
e.printStackTrace();
}
if (200 == sevenEntity.getStatus()) {
String json1 = JSON.toJSONString(sevenEntity.getResult());
List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FireCar_Start") && t.get("FireCar_Start").equals("true"))).collect(Collectors.toList());
int num = collect.size();
item.put("count", num);
}
if (item.containsKey("carStateDate") && !ObjectUtils.isEmpty(item.get("carStateDate"))) {
try {
Date carStateDate = DateUtils.dateParse(item.get("carStateDate").toString(), "yyyy-MM-dd'T'HH:mm:ss");
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
View file @ a03f81dd
......@@ -99,6 +99,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
......@@ -652,7 +653,17 @@ public class FireFightingSystemController extends AbstractBaseController {
@ApiOperation(value = "消防系统列表查询（不分页）", notes = "下拉使用")
@GetMapping(value = "/list")
public List<FireFightingSystemEntity> listAll() {
return fireFightingSystemService.list();
ReginParams reginParams = getSelectedOrgInfo();
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
if (!ValidationUtil.isEmpty(personIdentity)) {
String bizOrgCode = personIdentity.getBizOrgCode();
if (StringUtils.isNotBlank(bizOrgCode)) {
QueryWrapper<FireFightingSystemEntity> qw = new QueryWrapper<>();
qw.lambda().likeRight(FireFightingSystemEntity::getBizOrgCode, bizOrgCode);
return fireFightingSystemService.list(qw);
}
}
return new ArrayList<>();
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @ a03f81dd
......@@ -192,7 +192,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
@RequestMapping(value = "/fireAlarmLogPage", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "消防报警列表分页查询", produces = "application/json;charset=UTF-8", notes = "消防报警列表分页查询")
public ResponseModel pageQuery(@RequestParam(required = false) String system, @RequestParam(required = false) String specificIndexKey, CommonPageable commonPageable) {
public ResponseModel pageQuery(@RequestParam(required = false) String code, @RequestParam(required = false) String typeCode, CommonPageable commonPageable) {
if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1);
}
......@@ -200,11 +200,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
List<CommonRequest> queryRequests = new ArrayList<>();
CommonRequest request7 = new CommonRequest();
request7.setName("system");
request7.setValue(StringUtil.isNotEmpty(system) ? StringUtils.trimToNull(system) : null);
request7.setValue(StringUtil.isNotEmpty(code) ? StringUtils.trimToNull(code) : null);
queryRequests.add(request7);
CommonRequest request8 = new CommonRequest();
request8.setName("specificIndexKey");
request8.setValue(StringUtil.isNotEmpty(specificIndexKey) ? StringUtils.trimToNull(specificIndexKey) : null);
request8.setValue(StringUtil.isNotEmpty(typeCode) ? StringUtils.trimToNull(typeCode) : null);
queryRequests.add(request8);
if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())) {
CommonRequest request13 = new CommonRequest();
......@@ -268,10 +268,15 @@ public class SupervisionConfigureController extends AbstractBaseController {
}
String nowStrLong = DateUtils.getNowStrLong();
Date mounthDate = DateUtils.dateAddMonths(null, -1);
Date mounthDate = null;
try {
mounthDate = DateUtils.getCurrentMonthStartTime(new Date());
} catch (Exception e) {
throw new RuntimeException(e);
}
Date halfHour = DateUtils.dateAddMinutes(null, -30);
Date twoHour = DateUtils.dateAddHours(null, -2);
Date fourHour = DateUtils.dateAddHours(null, -3);
Date fourHour = DateUtils.dateAddHours(null, -4);
String startDateStr = DateUtils.convertDateToString(mounthDate, DateUtils.DATE_TIME_PATTERN);
String half = DateUtils.convertDateToString(halfHour, DateUtils.DATE_TIME_PATTERN);
String two = DateUtils.convertDateToString(twoHour, DateUtils.DATE_TIME_PATTERN);
......@@ -294,19 +299,22 @@ public class SupervisionConfigureController extends AbstractBaseController {
List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
int num = collect.size();
item.put("monthStartNum", num);
} else if (200 == halfHourEntity.getStatus()) {
}
if (200 == halfHourEntity.getStatus()) {
String json1 = JSON.toJSONString(halfHourEntity.getResult());
List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
int num = collect.size();
item.put("halfHourStartNum", num);
} else if (200 == twoHourEntity.getStatus()) {
}
if (200 == twoHourEntity.getStatus()) {
String json1 = JSON.toJSONString(twoHourEntity.getResult());
List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
int num = collect.size();
item.put("twoHourStartNum", num);
} else if (200 == fourHourEntity.getStatus()) {
}
if (200 == fourHourEntity.getStatus()) {
String json1 = JSON.toJSONString(fourHourEntity.getResult());
List<Map<String, String>> listObject1 = (List<Map<String, String>>) JSONArray.parse(json1);
List<Map<String, String>> collect = listObject1.stream().filter(t -> (t.containsKey("FHS_PressurePump_Start") && t.get("FHS_PressurePump_Start").equals("true"))).collect(Collectors.toList());
......@@ -320,7 +328,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
boolean time = false;
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"));
if(!ObjectUtils.isEmpty(stateMap.get("value"))){
item.put("equipment_index_name", stateMap.get("equipment_index_name"));
} else {
item.put("equipment_index_name", "无信号");
}
if ("启动".equals(stateMap.get("equipment_index_name"))) {
long update_time = 0L;
try {
......@@ -336,7 +348,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
item.put("upTime", diffMinute);
}
}
item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? "正常" : "异常");
item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 || time ? "正常" : "异常");
return item;
}).collect(Collectors.toList());
List<Map<String, Object>> stateMap = fireFightingSystemMapper.queryStartAndStopBySpecificId(ids);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @ a03f81dd
......@@ -875,11 +875,11 @@ public class TopographyController extends AbstractBaseController {
String prefix = null;
String suffix = null;
if (iotCode.length() > 8) {
if (StringUtil.isNotEmpty(iotCode) && iotCode.length() > 8) {
prefix = iotCode.substring(0, 8);
suffix = iotCode.substring(8);
} else {
return CommonResponseUtil.failure("装备物联编码错误，请确认！");
return CommonResponseUtil.failure("装备物联编码不存在或编码错误，请确认！");
}
ResponseModel entity = null;
try {
......@@ -1031,11 +1031,11 @@ public class TopographyController extends AbstractBaseController {
String prefix = null;
String suffix = null;
if (iotCode.length() > 8) {
if (StringUtil.isNotEmpty(iotCode) && iotCode.length() > 8) {
prefix = iotCode.substring(0, 8);
suffix = iotCode.substring(8);
} else {
return CommonResponseUtil.failure("装备物联编码错误，请确认！");
return CommonResponseUtil.failure("装备物联编码不存在或编码错误，请确认！");
}
ResponseModel entity = null;
String[] filedKeyArr = parmfieldKey.split(",");
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/UserController.java
View file @ a03f81dd
......@@ -595,7 +595,7 @@ public class UserController extends AbstractBaseController {
map.put("parentId", map.get("parentId") + "");
listCompanyModel.add(map);
long key = Long.valueOf(map.get("sequenceNbr").toString());
List<DepartmentModel> listdep = mapDepartments.get(key);
List<DepartmentModel> listdep = mapDepartments.getOrDefault(key,new ArrayList<>());
List<Map<String, Object>> dep = new ArrayList();
for (DepartmentModel departmentModel : listdep) {
if (departmentModel != null) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
View file @ a03f81dd
......@@ -300,13 +300,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
*/
Page<Map<String, Object>> getFireCarInfoByWL(Page page, @Param("bizOrgCode") String bizOrgCode);
/**
* 物联监控页面消防车辆信息
*
* @param carId
* @return
*/
Map<String, Object> getFireCaStartBySeven(@Param("carId") String carId);
/**
* 获取水源信息
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ a03f81dd
......@@ -448,7 +448,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
nowValue,
nowValue.compareTo(minValue) < 0 ? "低于最低报警阈值" + minValue : "超过最高报警阈值" + maxValue
);
model.setTitle(equipmentSpecificIndex.getEquipmentSpecificName());
model.setTitle("模拟量提醒");
model.setBody(bodyMain);
model.setMsgType("FoamTankOrPipeNetwork");
model.setSendTime(new Date());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SupervisionVideoServiceImpl.java
View file @ a03f81dd
......@@ -8,6 +8,7 @@ import com.yeejoin.equipmanage.mapper.SupervisionVideoMapper;
import com.yeejoin.equipmanage.service.ISupervisionVideoService;
import com.yeejoin.equipmanage.service.IVideoService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
......@@ -46,12 +47,14 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
supervisionVideoMapper.delete(new QueryWrapper<SupervisionVideo>().eq("biz_org_code",bizOrgCode));
List<SupervisionVideo> list = new ArrayList<>();
String ids = map.get("ids");
for (String s : ids.split(",")) {
SupervisionVideo supervisionVideo = new SupervisionVideo();
supervisionVideo.setCameraId(s);
supervisionVideo.setBizOrgCode(bizOrgCode);
supervisionVideo.setId(Long.valueOf(String.valueOf(UUID.randomUUID().getLeastSignificantBits()).replace("-", "")));
list.add(supervisionVideo);
if(StringUtils.isNotEmpty(ids)){
for (String s : ids.split(",")) {
SupervisionVideo supervisionVideo = new SupervisionVideo();
supervisionVideo.setCameraId(s);
supervisionVideo.setBizOrgCode(bizOrgCode);
supervisionVideo.setId(Long.valueOf(String.valueOf(UUID.randomUUID().getLeastSignificantBits()).replace("-", "")));
list.add(supervisionVideo);
}
}
return saveBatch(list);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/utils/TemplateCellWriteHandlerDate.java
View file @ a03f81dd
......@@ -72,7 +72,7 @@ public class TemplateCellWriteHandlerDate implements SheetWriteHandler {
// 设置下拉单元格的首行 末行 首列 末列
CellRangeAddressList rangeList = new CellRangeAddressList(1, 65536, k, k);
// 如果下拉值总数大于100，则使用一个新sheet存储，避免生成的导入模板下拉值获取不到
if (v.length > LIMIT_NUMBER) {
if (v.length >= LIMIT_NUMBER) {
//定义sheet的名称
//1.创建一个隐藏的sheet 名称为 hidden + k
String sheetName = "hidden" + k;
......
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 @ a03f81dd
......@@ -510,32 +510,26 @@ public class FirefightersController extends BaseController {
if(null != reginParam) {
String bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
// String bizOrgName = reginParam.getPersonIdentity().getCompanyName();
QueryWrapper<Firefighters> firefightersQueryWrapper2 = new QueryWrapper<>();
firefightersQueryWrapper2.eq("amos_user_id",reginParam.getUserModel().getUserId());
Firefighters one = iFirefightersService.getOne(firefightersQueryWrapper2);
QueryWrapper<FireTeam> fireTeamQuery = new QueryWrapper<>();
fireTeamQuery.eq("company",one.getCompany());
fireTeamQuery.eq("type_code","116");
fireTeamQuery.eq("is_delete","0");
List<FireTeam> fireTeamList = iFireTeamService.list(fireTeamQuery);
// QueryWrapper<Firefighters> firefightersQueryWrapper2 = new QueryWrapper<>();
// firefightersQueryWrapper2.eq("amos_user_id",reginParam.getUserModel().getUserId());
// Firefighters one = iFirefightersService.getOne(firefightersQueryWrapper2);
List<Map<String,Object>> list = new ArrayList<>();
for (FireTeam fireTeam :fireTeamList
) {
QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
firefightersQueryWrapper1.eq("fire_team_id", fireTeam.getSequenceNbr());
List<Firefighters> firefighters = iFirefightersService.getBaseMapper().selectList(firefightersQueryWrapper1);
firefighters.stream().forEach(e -> {
Map<String, Object> map = new HashMap<>();
map.put("name", e.getName());
map.put("jobTitle", e.getJobTitle());
map.put("bizOrgName", e.getBizOrgName());
map.put("bizOrgCode", bizOrgCode);
map.put("amosUserId", e.getOrgUsrId());
map.put("personnelPhotos", e.getPersonnelPhotos());
list.add(map);
});
}
QueryWrapper<Firefighters> firefightersQueryWrapper1 = new QueryWrapper<>();
firefightersQueryWrapper1.like("biz_org_code", bizOrgCode);
firefightersQueryWrapper1.eq("people_type", "1601");
firefightersQueryWrapper1.eq("is_delete", "0");
List<Firefighters> firefighters = iFirefightersService.getBaseMapper().selectList(firefightersQueryWrapper1);
firefighters.stream().forEach(e -> {
Map<String, Object> map = new HashMap<>();
map.put("name", e.getName());
map.put("jobTitle", e.getJobTitle());
map.put("bizOrgName", e.getBizOrgName());
map.put("bizOrgCode", bizOrgCode);
map.put("amosUserId", e.getOrgUsrId());
map.put("personnelPhotos", e.getPersonnelPhotos());
list.add(map);
});
JSONObject object = new JSONObject();
object.put("persons",list);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @ a03f81dd
......@@ -207,8 +207,11 @@ public class ExcelServiceImpl {
// if(org.apache.commons.lang3.StringUtils.isBlank(bizOrgCode)){
// authFalg=true;
// }
//效验参数
boolean authFlag = getFlag(par);
//效验参数
boolean authFlag = true;
if (!"QDSJ".equals(excelDto.getType())) {
authFlag = getFlag(par);
}
switch (excelDto.getType()) {
......
amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql
View file @ a03f81dd
......@@ -7707,4 +7707,35 @@ WHERE
0 <> find_in_set( '011023306003010000000013', `sa`.`system_codes` ))
ORDER BY
`sa`.`create_date` DESC
LIMIT 60;
\ No newline at end of file
LIMIT 60;
-- 运维概览-韶山消防巡查统计
DROP VIEW IF EXISTS `v_fire_check_num_shaoshan`;
CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v_fire_check_num_shaoshan` AS
SELECT
(
SELECT
ifnull( sum( `p_plan_task`.`point_num` ), 0 )
FROM
`p_plan_task`
WHERE
( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
) AS `point_num`,
(
SELECT
ifnull( sum( `p_plan_task`.`point_num` ), 0 )
FROM
`p_plan_task`
WHERE
`p_plan_task`.`finish_status` = 3
AND ( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
) AS `miss_num`,
(
SELECT
ifnull( sum( `p_plan_task`.`point_num` ), 0 )
FROM
`p_plan_task`
WHERE
( `p_plan_task`.`finish_status` = 0 )
AND ( to_days( `p_plan_task`.`begin_time` ) - to_days( curdate()) ) <= 0 AND ( to_days( `p_plan_task`.`end_time` ) - to_days( curdate()) ) >= 0
) AS `unfinish_num`;
\ No newline at end of file
amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
View file @ a03f81dd
......@@ -262,4 +262,15 @@
MODIFY COLUMN `level_device_name` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水池液位显示装置名称';
</sql>
</changeSet>
<changeSet author="keyong" id="202210131721-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group"/>
</preConditions>
<comment>添加特殊设备字段</comment>
<sql>
REPLACE INTO `wl_form_group`(`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674825, 'CAFS泡沫罐', '92031900', 'equip', 'edit,delete', 2581805, '2022-10-09 03:36:43');
REPLACE INTO `wl_form_group`(`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674826, '管网压力探测器', '92011000', 'equip', 'edit,delete', 2581805, '2022-10-09 03:36:44');
REPLACE INTO `wl_form_group`(`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674827, '消防水池装置', '92010700', 'equip', 'edit,delete', 2581805, '2022-10-09 03:36:44');
</sql>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @ a03f81dd
......@@ -1351,7 +1351,7 @@
find_in_set( #{param.system}, `wlesal`.`system_codes` )
</if>
<if test="param.fireEquipmentSpecificIndexKey != null and param.fireEquipmentSpecificIndexKey != ''">
AND wles.type = #{param.fireEquipmentSpecificIndexKey}
AND wlesal.type = #{param.fireEquipmentSpecificIndexKey}
</if>
<if test="param.bizOrgCode != null and param.bizOrgCode != ''">
AND wles.biz_org_code like concat (#{param.bizOrgCode},'%')
......@@ -1391,7 +1391,7 @@
) fireAlarm ON (((
date_format( `fireAlarm`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
)
AND ( `fireAlarm`.`equipment_specific_index_name` = '火警' )
AND ( `fireAlarm`.`type` = 'FIREALARM' )
)))
GROUP BY
`weekUtil`.`click_date`
......@@ -1420,7 +1420,7 @@
</where>
) `breakdown` ON (((
`weekUtil`.`click_date` = date_format( `breakdown`.`create_date`, '%Y-%m-%d' ))
AND ( `breakdown`.`equipment_specific_index_name` = '故障' ))))
AND ( `breakdown`.`type` = 'BREAKDOWN' ))))
GROUP BY
`weekUtil`.`click_date`
ORDER BY
......@@ -1449,7 +1449,7 @@
) `shield` ON (((
date_format( `shield`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
)
AND ( `shield`.`equipment_specific_index_name` = '屏蔽' ))))
AND ( `shield`.`type` = 'SHIELD' ))))
GROUP BY
`weekUtil`.`click_date`
ORDER BY
......@@ -1479,7 +1479,7 @@
date_format( `other`.`create_date`, '%Y-%m-%d' ) = `weekUtil`.`click_date`
)
AND (
`other`.`equipment_specific_index_name` NOT IN ( '火警', '故障', '屏蔽' )))))
`other`.`type` NOT IN ( 'SHIELD', 'BREAKDOWN', 'FIREALARM' )))))
GROUP BY
`weekUtil`.`click_date`
ORDER BY
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ a03f81dd
......@@ -2320,6 +2320,7 @@
(
SELECT
`wc`.`id` AS `id`,
`wc`.`iot_code` AS `iot_code`,
`wc`.`name` AS `name`,
IFNULL( max( CASE WHEN ( `wcp`.`equipment_index_key` = 'FireCar_WaterCapacity' ) THEN `wcp`.`value` END ), 0 ) AS `waterCapacity`,
IFNULL( max( CASE WHEN ( `wcp`.`equipment_index_key` = 'FireCar_FoamCapacity' ) THEN `wcp`.`value` END ), 0 ) AS `foamCapacity`,
......@@ -2494,7 +2495,7 @@
IFNULL( rp.min_water_level, 0 ) AS minLevel,
IFNULL( rp.max_water_level, 0 ) AS maxLevel,
(select
avg(IFNULL(ei.`value`,0))
FORMAT(avg(IFNULL(ei.`value`,0)), 2)
from
wl_equipment_specific_index ei
where
......@@ -2805,7 +2806,8 @@
<select id="queryPressureNowStateBySpecificId" resultType="java.util.Map">
SELECT
i.update_date,
i.equipment_index_name
i.equipment_index_name,
value
FROM
wl_equipment_specific_index i
WHERE
......@@ -2976,7 +2978,7 @@
ifnull( `rp`.`min_water_level`, 0 ) AS `minLevel`,
ifnull( `rp`.`max_water_level`, 0 ) AS `maxLevel`,
(select
avg(IFNULL(ei.`value`,0))
FORMAT(avg(IFNULL(ei.`value`,0)), 2)
from
wl_equipment_specific_index ei
where
......@@ -4530,11 +4532,6 @@
temp.notReturnd DESC
</select>
<select id="getFireCaStartBySeven" resultType="java.util.Map">
select count(1) as count from wl_car_property wcp where
wcp.create_date BETWEEN DATE_SUB(NOW(),INTERVAL 7 DAY) and now()
and equipment_index_key = 'FireCar_Start' and value = 'true' and car_id = #{carId}
</select>
<select id="getWaterInfoBySuper" resultType="java.util.Map">
select * from (
......@@ -4640,7 +4637,7 @@
)
END
) AS levelAbs,
a.nowLevel,
IFNULL( a.nowLevel, '--' ) nowLevel,
(
CASE
......@@ -4666,7 +4663,7 @@
IFNULL( rp.min_water_level, 0 ) AS minLevel,
IFNULL( rp.max_water_level, 0 ) AS maxLevel,
(select
avg(IFNULL(ei.`value`,0))
FORMAT(avg(IFNULL(ei.`value`,0)), 2)
from
wl_equipment_specific_index ei
where
......@@ -4824,7 +4821,7 @@
IFNULL( rp.min_water_level, 0 ) AS minLevel,
IFNULL( rp.max_water_level, 0 ) AS maxLevel,
(select
avg(IFNULL(ei.`value`,0))
FORMAT(avg(IFNULL(ei.`value`,0)), 2)
from
wl_equipment_specific_index ei
where
......@@ -4844,6 +4841,7 @@
GROUP BY
r.sequence_nbr
) a
ORDER BY levelStatus DESC
</select>
<select id="getPipeNetworkBySuper" resultType="java.util.Map">
......@@ -4930,9 +4928,17 @@
FROM
wl_equipment_specific_index
WHERE
equipment_specific_id IN ( SELECT id FROM wl_equipment_specific WHERE FIND_IN_SET( #{id}, system_id ) > 0 AND biz_org_code LIKE concat(#{bizOrgCode}, '%') )
equipment_specific_id IN (
SELECT
wl.id
FROM
wl_equipment_specific wl
WHERE
FIND_IN_SET( ( SELECT f.id FROM f_fire_fighting_system f WHERE `code` = #{systemCode} ), system_id ) > 0
AND biz_org_code LIKE concat(#{bizOrgCode}, '%')
)
AND ((
`is_alarm` = 1
`is_alarm` = 1
AND `value` = 'true'
)
OR ( `is_alarm` = 0 AND `value` = 'false' ))
......@@ -4940,7 +4946,7 @@
<select id="queryStartAndStopBySpecificId" resultType="java.util.Map">
SELECT
i.equipment_specific_id,
i.update_date,
DATE_FORMAT(i.update_date,'%Y-%m-%d %H:%i:%S') update_date,
i.equipment_index_name
FROM
wl_equipment_specific_index i
......
amos-boot-system-jcs/src/main/resources/db/changelog/init/dl_amos_common_biz-DUTY_POST_TYPE-电力值班类型字典.sql 0 → 100644
View file @ a03f81dd
DELETE FROM cb_data_dictionary WHERE type = 'DUTY_POST_TYPE';
DELETE FROM cb_data_dictionary WHERE type = 'DUTY_POST_TYPE';
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1664, '1664', '值班站长', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 1);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1665, '1665', '副值班长', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 2);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1666, '1666', '值班员', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 3);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1667, '1667', '驻站消防队长', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 4);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1668, '1668', '消防员', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 5);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1669, '1669', '保安', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 6);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1670, '1670', '副值班员', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 7);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1671, '1671', '司机', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 8);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1672, '1672', '消防安全负责人', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 9);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1673, '1673', '消防安全管理人', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 10);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1674, '1674', '消防专职队队长', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 11);
REPLACE INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `extend`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1675, '1675', '消防专职队队员', 'DUTY_POST_TYPE', NULL, NULL, NULL, NULL, NULL, NULL, b'0', 12);
\ No newline at end of file
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ a03f81dd
......@@ -3629,5 +3629,56 @@
INSERT INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `extend`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1802, '1580479144087552002', '专职消防队', 'CB_USER_GROUP', '治理人,验证人,延期治理审批人,延迟治理人,隐患填报人,default', NULL, NULL, NULL, NULL, NULL, b'0', 1);
</sql>
</changeSet>
<changeSet author="ky" id="1666078784">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" />
<not>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</not>
</preConditions>
<comment>add data cb_data_dictionary</comment>
<sql>
INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1803, 'waterTank', '消防水箱', 'XFSYLX', NULL, NULL, NULL, NULL, NULL, 0, 1);
</sql>
</changeSet>
<changeSet author="zs" id="202210191455-01">
<comment>修改字典值 </comment>
<sql>
update cb_data_dictionary set type_desc = 'studio_normalapp_3056965,AMOS_ADMIN' where sequence_nbr = 1800;
update cb_data_dictionary set type_desc = 'studio_normalapp_3056965' where sequence_nbr = 1801;
update cb_data_dictionary set type_desc = 'studio_normalapp_3056965' where sequence_nbr = 1802;
</sql>
</changeSet>
<changeSet author="zs" id="202210191455-02">
<comment>修改字典值 </comment>
<sql>
update cb_data_dictionary set extend = '治理人,验证人,延期治理审批人,延迟治理人,隐患填报人,默认角色' where sequence_nbr = 1800;
update cb_data_dictionary set extend = '治理人,验证人,延期治理审批人,延迟治理人,隐患填报人,默认角色' where sequence_nbr = 1801;
update cb_data_dictionary set extend = '治理人,验证人,延期治理审批人,延迟治理人,隐患填报人,默认角色' where sequence_nbr = 1802;
</sql>
</changeSet>
<changeSet author="zs" id="202210201340">
<comment>修改字典值 </comment>
<sql>
update cb_data_dictionary set extend = '治理人,验证人,延期治理审批人,延迟治理人,隐患填报人,默认角色,用户管理权限角色' where sequence_nbr = 1800;
</sql>
</changeSet>
<changeSet author="tym" id="202210211104">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_dynamic_form_column" />
<not>
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_dynamic_form_column"/>
</not>
</preConditions>
<comment>人员优化加字段</comment>
<sql>
INSERT INTO `cb_dynamic_form_column` (`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812113, 'qualificationCertificate', '岗位资质证书', 'upload', 9, 'eq', b'0', b'0', '246', NULL, NULL, NULL, '2022-10-21 10:29:41', b'0', NULL, 30, NULL);
</sql>
</changeSet>
</databaseChangeLog>
amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/enums/TableIdEnum.java 0 → 100644
View file @ a03f81dd
package com.yeejoin.amos.boot.module.tdc.api.enums;
import java.util.HashMap;
import java.util.Map;
public enum TableIdEnum {
idx_biz_lvbc("idx_biz_lvbc","65f78cc7-aeda-45f7-9146-5393efa9ebdb"),
idx_biz_5lba("idx_biz_5lba","698a6023-1ef9-4fff-97dc-9efa2d1b4f1a");
String idxTableName;
String TableId;
TableIdEnum(String idxTableName, String tableId) {
this.idxTableName = idxTableName;
TableId = tableId;
}
public String getIdxTableName() {
return idxTableName;
}
public void setIdxTableName(String idxTableName) {
this.idxTableName = idxTableName;
}
public String getTableId() {
return TableId;
}
public void setTableId(String tableId) {
TableId = tableId;
}
public static Map<String,String> map = new HashMap<>();
static{
for(TableIdEnum TableIdEnum: TableIdEnum.values()){
map.put(TableIdEnum.getIdxTableName(),TableIdEnum.getTableId());
}
}
}
amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/service/CheckModelService.java
View file @ a03f81dd
......@@ -59,7 +59,7 @@ public interface CheckModelService extends IService<CheckModel> {
JSONArray getDataTree();
List<Object> getRule(String project);
List<JSONObject> getRule(String project);
List<Object> getCompanyName();
......
amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/controller/CheckModelController.java
View file @ a03f81dd
......@@ -106,7 +106,7 @@ public class CheckModelController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/getRule")
@ApiOperation(httpMethod = "GET", value = "关联规则", notes = "关联规则")
public ResponseModel<List<Object>> getRule(String project) {
public ResponseModel<List<JSONObject>> getRule(String project) {
return ResponseHelper.buildResponse(checkModelService.getRule(project));
}
......
amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckModelImpl.java
View file @ a03f81dd
......@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
import com.yeejoin.amos.boot.module.tdc.api.enums.ModeNameProjectIdEnum;
import com.yeejoin.amos.boot.module.tdc.api.enums.ModelNameEnum;
import com.yeejoin.amos.boot.module.tdc.api.enums.TableIdEnum;
import com.yeejoin.amos.boot.module.tdc.api.feign.IdxFeignService;
import com.yeejoin.amos.boot.module.tdc.api.feign.PrivilegeFeignService;
import com.yeejoin.amos.boot.module.tdc.api.feign.UruleFeignService;
......@@ -209,14 +210,21 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
}
@Override
public List<Object> getRule(String project) {
public List<JSONObject> getRule(String project) {
List result = uruleFeignService.getRule(project).getResult();
List<Object> objectList = new ArrayList<>();
List<JSONObject> objectList = new ArrayList<>();
for(Object object: result){
JSONArray array = JSONObject.parseObject(JSON.toJSONString(object)).getJSONArray("resourceItems");
for(Object object1: array){
objectList.add(object1);
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(object1));
String modelRule = jsonObject.getString("path");
if(!ValidationUtil.isEmpty(modelRule)){
modelRule = modelRule.substring(modelRule.indexOf("/")+1,modelRule.indexOf("."));
}
jsonObject.put("path",modelRule);
objectList.add(jsonObject);
}
}
return objectList;
......@@ -244,6 +252,7 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
}
@Override
public String saveModel(JSONObject jsonObject){
......@@ -269,9 +278,9 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
}
}
String modelRule = jsonObject.getString("model_rule");
if(!ValidationUtil.isEmpty(modelRule)){
modelRule = modelRule.substring(modelRule.indexOf("/")+1,modelRule.indexOf("."));
}
// if(!ValidationUtil.isEmpty(modelRule)){
// modelRule = modelRule.substring(modelRule.indexOf("/")+1,modelRule.indexOf("."));
// }
JSONArray modelFile = jsonObject.getJSONArray("model_file");
String fileUrl = "";
Iterator iterator = modelFile.iterator();
......@@ -283,6 +292,7 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
fileUrl = fileUrl + ",";
}
}
JSONArray jsonArray = jsonObject.getJSONArray("amos_org_code");
for (Object o:jsonArray){
CheckModel checkModel = new CheckModel();
......@@ -302,36 +312,53 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
checkModelService.saveBatch(checkModelList);
// .saveBatch(checkModelList);
return null;
}
@Override
public Boolean modifyModel(JSONObject jsonObject){
String modelName = jsonObject.getString("modelName");
String idxTableName = jsonObject.getString("idxTableName");
String modelName = jsonObject.getString("model_name");
String url = jsonObject.getString("idx_table_name");
String tableId = url.substring(0,url.indexOf("$"));
// String tableId = url.substring(0,url.indexOf("$"));
// 截取$之后的所有字符串
String idxTableName = url.substring(url.indexOf("$")+1);
// String idxTableName = url.substring(url.indexOf("$")+1);
String modelPictureUrl = jsonObject.getString("model_picture_url");
JSONArray PictureUrl = jsonObject.getJSONArray("modelPictureUrl");
String modelPictureUrl = "";
if(!ValidationUtil.isEmpty(PictureUrl)){
for (Object o : PictureUrl) {
JSONObject jo = JSON.parseObject(JSON.toJSONString(o));
modelPictureUrl = jo.getString("url");
break;
}
}
String modelRule = jsonObject.getString("modelRule");
String modelRule = jsonObject.getString("model_rule");
// if(!ValidationUtil.isEmpty(modelRule)){
// modelRule = modelRule.substring(modelRule.indexOf("/"),modelRule.indexOf("."));
// }
if(!ValidationUtil.isEmpty(modelRule)){
modelRule = modelRule.substring(modelRule.indexOf("/"),modelRule.indexOf("."));
// String modelFile = jsonObject.getString("modelFile");
JSONArray modelFile1 = jsonObject.getJSONArray("modelFile");
String modelFile = "";
Iterator iterator = modelFile1.iterator();
if(iterator.hasNext()){
Object o = iterator.next();
JSONObject jo = JSON.parseObject(JSON.toJSONString(o));
modelFile = modelFile+jo.getString("url");
if(iterator.hasNext()){
modelFile = modelFile + ",";
}
}
String modelFile = jsonObject.getString("model_file");
String amosOrgCode = jsonObject.getString("amos_org_code");
String amosOrgCode = jsonObject.getString("amosOrgCode");
CheckModel checkModel = this.getById(jsonObject.getString("sequenceNbr"));
checkModel.setAmosOrgCode(amosOrgCode);
......@@ -340,7 +367,7 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
checkModel.setModelPictureUrl(modelPictureUrl);
checkModel.setModelRule(modelRule);
checkModel.setModelFile(modelFile);
checkModel.setTableId(tableId);
checkModel.setTableId(TableIdEnum.map.get(idxTableName));
checkModel.setAmosOrgName(ModelNameEnum.map.get(amosOrgCode));
checkModel.setProjectId(ModeNameProjectIdEnum.map.get(ModelNameEnum.map.get(amosOrgCode)));
......
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