Skip to content

A
amos-boot-biz
Commit ef45b114 authored by tangwei's avatar tangwei
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents 98ac3988 e876d96e
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 74 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgMenuDto.java
View file @ ef45b114
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.api.dto;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.experimental.Accessors;
import net.bytebuddy.implementation.bind.annotation.Super;
import java.util.List;
......@@ -26,7 +27,6 @@ public class OrgMenuDto {
private List<OrgMenuDto> children;
private String bizOrgType;
private String bizOrgCode;
private int num;//统计值
public Boolean getLeaf() {
return ObjectUtils.isEmpty(children);
......@@ -53,16 +53,6 @@ public class OrgMenuDto {
this.leaf = leaf;
this.bizOrgCode = bizOrgCode;
}
public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType, boolean leaf, String bizOrgCode,int num) {
super();
this.key = key;
this.title = title;
this.parentId = parentId;
this.bizOrgType = bizOrgType;
this.leaf = leaf;
this.bizOrgCode = bizOrgCode;
this.num=num;
}
public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType, boolean leaf) {
super();
this.key = key;
......@@ -79,4 +69,7 @@ public class OrgMenuDto {
this.bizOrgType = bizOrgType;
}
public OrgMenuDto() {
// TODO Auto-generated constructor stub
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/KeySiteMapper.java
View file @ ef45b114
......@@ -20,7 +20,7 @@ public interface KeySiteMapper extends BaseMapper<KeySite> {
*/
public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate,
String useNature, String fireFacilitiesInfo);
String useNature, String fireFacilitiesInfo, Long belongId);
/**
* 获取所有的重点部位数据
* @return
......@@ -32,4 +32,5 @@ public List<KeySiteDto> getKeySiteList();
* @return
*/
public KeySiteDto getSequenceNbr(Long sequenceNbr);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IKeySiteService.java
View file @ ef45b114
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.api.service;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import java.util.List;
......@@ -30,7 +31,7 @@ public KeySiteDto save(KeySiteDto model);
* @param keySite
* @return
*/
public boolean update (KeySiteDto keySite);
public boolean update(KeySiteDto keySite, AgencyUserModel userInfo) ;
/**
* 获取机场单位组织结构树，包含单位下部门数量的统计
* @return
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/ILinkageUnitService.java
View file @ ef45b114
......@@ -24,9 +24,20 @@ public interface ILinkageUnitService {
LinkageUnitDto queryOne(Long sequenceNbr);
public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
/**
* 联动单位分页查询
*
* @param page
* @param isDelete
* @param unitName 单位名称
* @param linkageUnitType 联动单位类型
* @param emergencyLinkageUnitCode 紧急联动单位类型code
* @return
*/
Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
@Condition(Operator.eq) Boolean isDelete,
@Condition(Operator.like) String unitName,
@Condition(Operator.eq) String linkageUnitType);
@Condition(Operator.eq) String linkageUnitType,
@Condition(Operator.eq) String emergencyLinkageUnitCode);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml
View file @ ef45b114
......@@ -41,7 +41,7 @@ LEFT JOIN (
b.`name`
FROM
cb_key_site c
LEFT JOIN cb_data_dictionary b ON c.fire_endurance_rate = b.`code`
LEFT JOIN cb_data_dictionary b ON c.fire_endurance_rate = b.`code` and b.type ='NHDJ' group by b.`name`
) fer ON c.fire_endurance_rate = fer.fire_endurance_rate
LEFT JOIN (
SELECT
......@@ -49,7 +49,7 @@ LEFT JOIN (
b.`name`
FROM
cb_key_site c
LEFT JOIN cb_data_dictionary b ON c.use_nature = b.`code`
LEFT JOIN cb_data_dictionary b ON c.use_nature = b.`code` and b.type ='SYXZ' group by b.`name`
) un ON c.use_nature = un.use_nature
left join cb_org_usr cou on c.building_id =cou.sequence_nbr
where c.is_delete=FALSE
......@@ -68,6 +68,9 @@ where c.is_delete=FALSE
<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != ''">
AND c.`fire_facilities_info`=#{fireFacilitiesInfo}
</if>
<if test="belongId != null and belongId!='-1' and belongId != -1">
AND c.`belong_id`=#{belongId}
</if>
</select>
......@@ -108,7 +111,7 @@ LEFT JOIN (
b.`name`
FROM
cb_key_site c
LEFT JOIN cb_data_dictionary b ON c.fire_endurance_rate = b.`code`
LEFT JOIN cb_data_dictionary b ON c.fire_endurance_rate = b.`code` group by b.`name`
) fer ON c.fire_endurance_rate = fer.fire_endurance_rate
LEFT JOIN (
SELECT
......@@ -116,7 +119,7 @@ LEFT JOIN (
b.`name`
FROM
cb_key_site c
LEFT JOIN cb_data_dictionary b ON c.use_nature = b.`code`
LEFT JOIN cb_data_dictionary b ON c.use_nature = b.`code` group by b.`name`
) un ON c.use_nature = un.use_nature
left join cb_org_usr cou on c.building_id =cou.sequence_nbr
where c.sequence_nbr=#{sequenceNbr} and c.is_delete=FALSE;
......@@ -159,7 +162,7 @@ LEFT JOIN (
b.`name`
FROM
cb_key_site c
LEFT JOIN cb_data_dictionary b ON c.fire_endurance_rate = b.`code`
LEFT JOIN cb_data_dictionary b ON c.fire_endurance_rate = b.`code` group by b.`name`
) fer ON c.fire_endurance_rate = fer.fire_endurance_rate
LEFT JOIN (
SELECT
......@@ -167,7 +170,7 @@ LEFT JOIN (
b.`name`
FROM
cb_key_site c
LEFT JOIN cb_data_dictionary b ON c.use_nature = b.`code`
LEFT JOIN cb_data_dictionary b ON c.use_nature = b.`code` group by b.`name`
) un ON c.use_nature = un.use_nature
left join cb_org_usr cou on c.building_id =cou.sequence_nbr
where c.is_delete=FALSE;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @ ef45b114
......@@ -474,14 +474,14 @@ public class CommandController extends BaseController {
@TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
@GetMapping(value = "LinkageUnitDto/page")
@ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoqueryForPage(@RequestParam(value = "pageNum") int pageNum,
public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoQueryForPage(@RequestParam(value = "pageNum") int pageNum,
@RequestParam(value = "pageSize") int pageSize,
String unitName, String linkageUnitType, String inAgreement) {
Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
page.setCurrent(pageNum);
page.setSize(pageSize);
Page<LinkageUnitDto> linkageUnitDtoPage = iLinkageUnitService.queryForLinkageUnitPage(page, false,
unitName, linkageUnitType);
unitName, linkageUnitType, null);
return ResponseHelper.buildResponse(linkageUnitDtoPage);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/KeySiteController.java
View file @ ef45b114
package com.yeejoin.amos.boot.module.common.biz.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -28,9 +21,20 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* 重点部位
......@@ -76,8 +80,8 @@ public class KeySiteController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "update/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新重点部位", notes = "根据sequenceNbr更新重点部位")
public ResponseModel<Boolean> updateBySequenceNbrKeySite(@RequestBody KeySiteDto model) {
return ResponseHelper.buildResponse(keySiteService.update(model));
public ResponseModel<Boolean> updateBySequenceNbrKeySite(@RequestBody KeySiteDto model ) {
return ResponseHelper.buildResponse(keySiteService.update(model, getUserInfo()));
}
/**
......@@ -146,7 +150,13 @@ public class KeySiteController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "机场单位组织结构树", notes = "机场单位组织结构树")
@GetMapping(value = "/getOrguserTree")
public ResponseModel<List<OrgMenuDto>> getOrguserTree() throws Exception{
return ResponseHelper.buildResponse(keySiteService.getOrguserTree());
List<OrgMenuDto> list = new ArrayList<OrgMenuDto>();
OrgMenuDto orgMenuDto =new OrgMenuDto();
orgMenuDto.setChildren(keySiteService.getOrguserTree());
orgMenuDto.setName("单位管理");
orgMenuDto.setTitle("单位管理");
list.add(orgMenuDto);
return ResponseHelper.buildResponse(list);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/LinkageUnitController.java
View file @ ef45b114
......@@ -116,12 +116,12 @@ public class LinkageUnitController extends BaseController {
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size, String unitName, String linkageUnitType, String inAgreement) {
(value = "size") int size, String unitName, String linkageUnitType, String inAgreement, String emergencyLinkageUnitCode) {
Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
page.setCurrent(current);
page.setSize(size);
Page<LinkageUnitDto> linkageUnitDtoPage = linkageUnitServiceImpl.queryForLinkageUnitPage(page, false,
unitName, linkageUnitType);
unitName, linkageUnitType, emergencyLinkageUnitCode);
Date now = new Date();
List<LinkageUnitDto> linkageUnitDtoList = linkageUnitDtoPage.getRecords().stream().map(item -> {
boolean isInAgreement = DateUtils.belongCalendar(now, item.getAgreementStartDate(),
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java
View file @ ef45b114
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -21,6 +21,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
......@@ -30,9 +31,11 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTreeDto;
import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.mapper.KeySiteMapper;
import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
/**
* 重点部位服务实现类
......@@ -54,13 +57,15 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
@Autowired
EquipFeignClient equipFeignClient;
@Autowired
private Sequence sequence;
/**
* 分页查询
*/
public IPage<KeySiteDto> queryForKeySitePage(Page<KeySiteDto> page, KeySite keySite) {
return keySiteMapper.getPageList(page, keySite.getName(), keySite.getBuildingId(),
keySite.getFireEnduranceRate(), keySite.getUseNature(), keySite.getFireFacilitiesInfo());
keySite.getFireEnduranceRate(), keySite.getUseNature(), keySite.getFireFacilitiesInfo(),keySite.getBelongId());
}
@Override
......@@ -84,12 +89,12 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
public List<KeySiteExcleDto> exportToExcel() {
List<KeySiteDto> list = this.queryForKeySiteList();
List<KeySiteExcleDto> excleList = new ArrayList<>();
list.stream().forEach(i->{
KeySiteExcleDto keySiteExcleDto =new KeySiteExcleDto();
list.stream().forEach(i -> {
KeySiteExcleDto keySiteExcleDto = new KeySiteExcleDto();
Bean.copyExistPropertis(i, keySiteExcleDto);
if(i.getFirePreventionFlag()) {
if (i.getFirePreventionFlag()) {
keySiteExcleDto.setFirePreventionFlagName("有");
}else {
} else {
keySiteExcleDto.setFirePreventionFlagName("无");
}
keySiteExcleDto.setUseNature(i.getUseNatureName());
......@@ -117,10 +122,13 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
@Override
@Transactional(rollbackFor = Exception.class)
public KeySiteDto save(KeySiteDto model) {
long sequenceId = sequence.nextId();
KeySite keySite = new KeySite();
Bean.copyExistPropertis(model, keySite);
keySite.setSequenceNbr(sequenceId);
model.setSequenceNbr(sequenceId);
this.save(keySite);
sourceFileService.saveAttachments(model.getSequenceNbr(), model.getAttachments());
saveAttachments(model);
// TODO Auto-generated method stub
return model;
}
......@@ -153,10 +161,13 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
@Override
@Transactional(rollbackFor = Exception.class)
public boolean update(KeySiteDto keySite) {
public boolean update(KeySiteDto keySite, AgencyUserModel userInfo) {
KeySite entity = new KeySite();
Bean.copyExistPropertis(keySite, entity);
entity.setIsDelete(false);
entity.setRecDate(new Date());
entity.setRecUserId(userInfo.getUserId());
entity.setRecUserName(userInfo.getUserName());
int num = keySiteMapper.updateById(entity);
Map<String, List<AttachmentDto>> map = keySite.getAttachments();
if (ObjectUtils.isNotEmpty(map)) {
......@@ -167,16 +178,17 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
}
return false;
}
@Override
public List<OrgMenuDto> getOrguserTree() {
return buildTreeParallel(orgUsrMapper.getCompanyAndCountDepartment());
return buildTreeParallel(orgUsrMapper.getCompanyAndCountDepartment());
}
public static List<OrgMenuDto> buildTreeParallel(List<OrgUsrTreeDto> list) {
public static List<OrgMenuDto> buildTreeParallel(List<OrgUsrTreeDto> list) {
List<OrgMenuDto> menuList = list.stream().map(o -> {
OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName()+" "+o.getNum(),
ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(), false,
o.getBizOrgCode(),o.getNum());
o.getBizOrgCode());
return menu;
}).collect(Collectors.toList());
......@@ -202,6 +214,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
});
return result;
}
@Override
public KeySiteDto getSequenceNbr(Long sequenceNbr) {
return keySiteMapper.getSequenceNbr(sequenceNbr);
......@@ -215,10 +228,11 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
Bean.copyExistPropertis(keySiteExcleDto, keySiteDto);
keySiteDto.setIsDelete(false);
if (StringUtils.isNotBlank(keySiteExcleDto.getBelongName())
&& keySiteExcleDto.getBelongName().contains("@")){
&& keySiteExcleDto.getBelongName().contains("@")) {
keySiteDto.setBelongId(Long.parseLong(keySiteExcleDto.getBelongName().split("@")[1]));
}
if (StringUtils.isNotBlank(keySiteExcleDto.getBuildingName()) && keySiteExcleDto.getBuildingName().contains("@")){
if (StringUtils.isNotBlank(keySiteExcleDto.getBuildingName())
&& keySiteExcleDto.getBuildingName().contains("@")) {
String[] fireEnduranceRateArray = keySiteExcleDto.getBuildingName().split("@");
keySiteDto.setBuildingId(Long.parseLong(fireEnduranceRateArray[1]));
keySiteDto.setBuildingName(fireEnduranceRateArray[0]);
......@@ -237,9 +251,9 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
keySiteDto.setUseNature(useNatureArray[1]);
}
}
if(keySiteExcleDto.getFirePreventionFlagName().equals("有")) {
if (keySiteExcleDto.getFirePreventionFlagName().equals("有")) {
keySiteDto.setFirePreventionFlag(true);
}else {
} else {
keySiteDto.setFirePreventionFlag(false);
}
excelList.add(keySiteDto);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/LinkageUnitServiceImpl.java
View file @ ef45b114
......@@ -61,8 +61,9 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
@Condition(Operator.eq) Boolean isDelete,
@Condition(Operator.like) String unitName,
@Condition(Operator.eq) String linkageUnitType) {
return this.queryForPage(page, null, false, isDelete, unitName, linkageUnitType);
@Condition(Operator.eq) String linkageUnitType,
@Condition(Operator.eq) String emergencyLinkageUnitCode) {
return this.queryForPage(page, null, false, isDelete, unitName, linkageUnitType, emergencyLinkageUnitCode);
}
/**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/controller/LoginController.java
View file @ ef45b114
package com.yeejoin.amos.fas.business.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -26,13 +25,16 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.fas.business.feign.PrivilegeFeign;
import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import com.yeejoin.amos.feign.privilege.util.DesUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -45,7 +47,7 @@ import io.swagger.annotations.ApiOperation;
@RestController
@RequestMapping(value = "/api/loginBytoken")
@Api(tags = "通过userName登录Api")
public class LoginController extends AbstractBaseController{
public class LoginController {
private static final Logger logger = LoggerFactory.getLogger(LoginController.class);
......@@ -81,18 +83,17 @@ public class LoginController extends AbstractBaseController{
reginParams = JSON.parseObject(redisTemplate.opsForValue().get(buildKey(userId, token)), ReginParams.class);
if(reginParams == null){
reginParams = new ReginParams();
Map<String, String> param = new HashMap<>();
param.put("loginId", userId);
param.put("password", password);
Object result = privilegeFeign.login(appKey, product, param).getResult();
if (ObjectUtils.isEmpty(result)){
IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
dPasswordAuthModel.setLoginId(userId);
dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
RequestContext.setProduct(product);
FeignClientResult feignClientResult = Privilege.authClient.idpassword(dPasswordAuthModel);
if (ObjectUtils.isEmpty(feignClientResult.getResult())){
throw new Exception("缺失登录信息");
}
Map<String ,String > re = (Map<String ,String >) result;
Map<String ,String > re = (Map<String, String>) feignClientResult.getResult();
String amosToken = re.get("token");
privilegeFeign.warrant(appKey, product, amosToken);
RequestContext.setToken(amosToken);
RequestContext.setProduct(product);
RequestContext.setAppKey(appKey);
......
amos-boot-system-fas/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml
View file @ ef45b114
......@@ -39,7 +39,7 @@
spe.iot_code,
spe.code as specific_code,
spe.system_id,
(select group_concat(manage.name) FROM `f_fire_fighting_system` as manage where spe.system_id = manage.id) as system_name
(select group_concat(manage.name) FROM `f_fire_fighting_system` as manage where find_in_set(manage.id, spe.system_id)) as system_name
from
(
SELECT amount,
......
amos-boot-system-fas/src/main/resources/db/mapper/dbTemplate_fmea_point_inputitem.xml
View file @ ef45b114
......@@ -35,7 +35,7 @@
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.fmeaId},
#{item.pointInputitemId}
#{item.pointInputitemId},
#{item.state}
)
</foreach>
......
amos-boot-system-fas/src/main/resources/db/mapper/dbTemplate_p_point.xml
View file @ ef45b114
......@@ -35,6 +35,7 @@
FROM
`p_point` p
<where>
is_delete = 0
<if test="list != null and list.length > 0">
AND
<foreach collection="list" item="item" index="index" open="(" close=")" separator="OR">
......
amos-boot-system-patrol/src/main/resources/db/changelog/patrol-3.0.1.xml
View file @ ef45b114
......@@ -29,4 +29,59 @@
ADD COLUMN `area_name` varchar(255) DEFAULT NULL COMMENT '物理区域名称（数据来源于装备wl_area）';
</sql>
</changeSet>
<changeSet author="maoying" id="16272868380001-1">
<preConditions onFail="MARK_RAN">
<columnExists tableName="p_plan_task" columnName="user_dept"/>
</preConditions>
<comment>MODIFY user_dept </comment>
<sql>
ALTER TABLE `p_plan_task`
MODIFY COLUMN `user_dept` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '人员部门信息';
</sql>
</changeSet>
<changeSet author="maoying" id="16272868380001-2">
<preConditions onFail="MARK_RAN">
<columnExists tableName="p_plan_task" columnName="user_name"/>
</preConditions>
<comment>MODIFY user_name </comment>
<sql>
ALTER TABLE `p_plan_task`
MODIFY COLUMN `user_name` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户姓名' ;
</sql>
</changeSet>
<changeSet author="maoying" id="16272868380001-3">
<preConditions onFail="MARK_RAN">
<columnExists tableName="p_check" columnName="user_id"/>
</preConditions>
<comment>MODIFY user_id </comment>
<sql>
ALTER TABLE `p_check`
MODIFY COLUMN `user_id` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '巡检人id，有可能有多个以,隔开';
</sql>
</changeSet>
<changeSet author="maoying" id="16272868380001-4">
<preConditions onFail="MARK_RAN">
<columnExists tableName="p_check" columnName="dep_id"/>
</preConditions>
<comment>MODIFY dep_id </comment>
<sql>
ALTER TABLE `p_check`
MODIFY COLUMN `dep_id` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '执行部门ids' ;
</sql>
</changeSet>
<changeSet author="maoying" id="16272868380001-5">
<preConditions onFail="MARK_RAN">
<columnExists tableName="p_check" columnName="dep_name"/>
</preConditions>
<comment>MODIFY dep_name </comment>
<sql>
ALTER TABLE `p_check`
MODIFY COLUMN `dep_name` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '执行部门名称';
</sql>
</changeSet>
</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