FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部

Browse Source 
添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员
添加getFirstInstitution()接口,返回机构第一级目录
This commit is contained in:
zhaokaiyao@91isoft.com
2021-07-21 11:30:44 +08:00
parent 4cee0f6bf5
commit 5825d8793f
8 changed files with 156 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java
+33 -65
View File
@@ -1,23 +1,21 @@
package com.adc.da.person.controller;
import com.adc.da.base.web.BaseController;
import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.person.entity.PersonCollectEO;
import com.adc.da.person.entity.TsPersonCollect;
import com.adc.da.person.page.PersonCollectEOPage;
import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.util.LoginUserUtil;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -28,7 +26,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
@RestController
@RequestMapping("/${restPath}/person/personCollect")
@Api(description = "|PersonCollectEO|")
public class PersonCollectEOController extends BaseController<PersonCollectEO> {
public class PersonCollectEOController extends BaseController<TsPersonCollect> {
private static final Logger logger = LoggerFactory.getLogger(PersonCollectEOController.class);
@@ -45,45 +43,10 @@ public class PersonCollectEOController extends BaseController<PersonCollectEO> {
**/
@ApiOperation(value = "|PersonCollectEO|分页查询")
@GetMapping("/page")
public ResponseMessage<PageInfo<PersonCollectEO>> page(Integer pageNo, Integer pageSize, String modeType, String collectTitle) throws Exception {
PersonCollectEOPage page = new PersonCollectEOPage();
if (StringUtils.isNotEmpty(modeType)) {
List<String> collectTypes = new ArrayList<>();
switch (modeType) {
case "STAND":
collectTypes.add("INLAND_STAND");
collectTypes.add("FOREIGN_STAND");
collectTypes.add("BUSINESS_STAND");
break;
case "LAWS":
collectTypes.add("INLAND_LAWS");
collectTypes.add("FOREIGN_LAWS");
break;
case "MSG":
collectTypes.add("INLAND_MSG");
collectTypes.add("FOREIGN_MSG");
collectTypes.add("RESOURCE_MSG");
break;
default:break;
}
page.setCollectTypeList(collectTypes);
}
if (pageNo != null) {
page.setPage(pageNo);
}else{
page.setPage(1);
}
if (pageSize != null) {
page.setPageSize(pageSize);
}else{
page.setPageSize(10);
}
if (StringUtils.isNotEmpty(collectTitle)) {
page.setCollectTitle(collectTitle);
}
page.setUserId(LoginUserUtil.getUserId());
List<PersonCollectEO> rows = personCollectEOService.queryByPersonCollectPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
public ResponseMessage<IPage<TsPersonCollect>> page(Integer pageNo, Integer pageSize, String collectTitle, String userId) throws Exception {
return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,userId);
}
@@ -91,7 +54,7 @@ public class PersonCollectEOController extends BaseController<PersonCollectEO> {
@ApiOperation(value = "|PersonCollectEO|查询")
@GetMapping("")
// @RequiresPermissions("person:personCollect:list")
public ResponseMessage<List<PersonCollectEO>> list(PersonCollectEOPage page) throws Exception {
public ResponseMessage<List<TsPersonCollect>> list(PersonCollectEOPage page) throws Exception {
return Result.success(personCollectEOService.queryByList(page));
}
@@ -99,39 +62,44 @@ public class PersonCollectEOController extends BaseController<PersonCollectEO> {
@ApiOperation(value = "|PersonCollectEO|详情")
@GetMapping("/{id}")
// @RequiresPermissions("person:personCollect:get")
public ResponseMessage<PersonCollectEO> find(@PathVariable String id) throws Exception {
public ResponseMessage<TsPersonCollect> find(@PathVariable String id) throws Exception {
return Result.success(personCollectEOService.getById(id));
}
/**
* 刘寅楠
* @param personCollectEO
* 收藏国内标准法规
* @param tsPersonCollect
* @return com.adc.da.person.entity.PersonCollectEO
* @throws Exception
*/
@ApiOperation(value = "|PersonCollectEO|新增")
@PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
// @RequiresPermissions("person:personCollect:create")
public ResponseMessage<PersonCollectEO> create(@RequestBody PersonCollectEO personCollectEO) throws Exception {
String userId = LoginUserUtil.getUserId();
personCollectEO.setId(UUIDUtils.randomUUID20());
personCollectEO.setUserId(userId);
personCollectEO.setValidFlag(0);
personCollectEO.setCreationTime(new Date());
personCollectEO.setModifyTime(new Date());
personCollectEOService.save(personCollectEO);
return Result.success("0","收藏成功,请到'我的收藏'中查看相关信息。",personCollectEO);
public ResponseMessage<TsPersonCollect> create(@RequestBody TsPersonCollect tsPersonCollect,String userId) throws Exception {
// String userId = LoginUserUtil.getUserId();
tsPersonCollect.setId(UUIDUtils.randomUUID20());
tsPersonCollect.setUserId(userId);
tsPersonCollect.setValidFlag(0);
tsPersonCollect.setCreationTime(new Date());
tsPersonCollect.setModifyTime(new Date());
personCollectEOService.save(tsPersonCollect);
return Result.success("0","收藏成功,请到'我的收藏'中查看相关信息。", tsPersonCollect);
}
@ApiOperation(value = "|PersonCollectEO|修改")
@PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
// @RequiresPermissions("person:personCollect:update")
public ResponseMessage<PersonCollectEO> update(@RequestBody PersonCollectEO personCollectEO) throws Exception {
personCollectEO.setModifyTime(new Date());
personCollectEOService.updateById(personCollectEO);
return Result.success(personCollectEO);
public ResponseMessage<TsPersonCollect> update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception {
tsPersonCollect.setModifyTime(new Date());
personCollectEOService.updateById(tsPersonCollect);
return Result.success(tsPersonCollect);
}
@@ -158,13 +126,13 @@ public class PersonCollectEOController extends BaseController<PersonCollectEO> {
@ApiOperation(value = "取消收藏")
@PutMapping("/updateByUserId")
// @RequiresPermissions("person:personCollect:updateByUserId") PersonCollectEO
public ResponseMessage<PersonCollectEO> updateByUserId(PersonCollectEO personCollectEO) throws Exception {
personCollectEO.setValidFlag(1);
int result = personCollectEOService.updateByPrimaryKeySelective(personCollectEO);
public ResponseMessage<TsPersonCollect> updateByUserId(TsPersonCollect tsPersonCollect) throws Exception {
tsPersonCollect.setValidFlag(1);
int result = personCollectEOService.updateByPrimaryKeySelective(tsPersonCollect);
if(result == 1){
return Result.success("0","取消成功",personCollectEO);
return Result.success("0","取消成功", tsPersonCollect);
} else {
return Result.error("0","取消失败",personCollectEO);
return Result.error("0","取消失败", tsPersonCollect);
}
}
adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java
+6 -6
View File
@@ -1,7 +1,7 @@
package com.adc.da.person.dao;
import com.adc.da.base.page.BasePage;
import com.adc.da.person.entity.PersonCollectEO;
import com.adc.da.person.entity.TsPersonCollect;
import com.adc.da.person.page.PersonCollectEOPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -16,15 +16,15 @@ import java.util.List;
* <b>日期：</b> 2018-09-03 <br>
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
*/
public interface PersonCollectEODao extends BaseMapper<PersonCollectEO> {
public interface PersonCollectEODao extends BaseMapper<TsPersonCollect> {
public List<PersonCollectEO> queryByList(BasePage page);
public List<TsPersonCollect> queryByList(BasePage page);
public int queryByCount(BasePage var1);
public List<PersonCollectEO> queryByPage(BasePage page);
public List<TsPersonCollect> queryByPage(BasePage page);
public List<PersonCollectEO> queryByPersonCollectPage(PersonCollectEOPage page);
public List<TsPersonCollect> queryByPersonCollectPage(PersonCollectEOPage page);
public int queryByPersonCollectPageCount(PersonCollectEOPage page);
@@ -34,6 +34,6 @@ public interface PersonCollectEODao extends BaseMapper<PersonCollectEO> {
int deleteByResIdList(@Param("idList") List<String> idList);
int updateByPrimaryKeySelective(PersonCollectEO personCollectEO);
int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect);
}
adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCollectEO.java → adc-da-sys/src/main/java/com/adc/da/person/entity/TsPersonCollect.java
+15 -4
View File
@@ -1,6 +1,9 @@
package com.adc.da.person.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.ArrayList;
@@ -13,24 +16,32 @@ import java.util.List;
* <b>日期：</b> 2018-09-03 <br>
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
*/
public class PersonCollectEO extends BaseEntity {
public class TsPersonCollect extends BaseEntity {
@TableField
//@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
//@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@TableField
private Date creationTime;
@TableLogic
private Integer validFlag;
@TableField
private String collectResId;
@TableField
private String collectInfoUri;
@TableField
private String collectTitle;
@TableField
private String collectType;
@TableField
private String userId;
@TableId
private String id;
//追加字段
@TableField(exist = false)
private List<PersonNoteEO> noteList = new ArrayList<>();
@@ -94,7 +105,7 @@ public class PersonCollectEO extends BaseEntity {
default: return null;
}
}
/** **/
public Date getModifyTime() {
return this.modifyTime;
adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java
+10 -6
View File
@@ -1,18 +1,20 @@
package com.adc.da.person.service;
import com.adc.da.person.entity.PersonCollectEO;
import com.adc.da.http.ResponseMessage;
import com.adc.da.person.entity.TsPersonCollect;
import com.adc.da.person.page.PersonCollectEOPage;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
public interface IPersonCollectEOService extends IService<PersonCollectEO> {
public interface IPersonCollectEOService extends IService<TsPersonCollect> {
public List<PersonCollectEO> queryByPage(PersonCollectEOPage page);
public List<TsPersonCollect> queryByPage(PersonCollectEOPage page);
public List<PersonCollectEO> queryByList(PersonCollectEOPage page);
public List<TsPersonCollect> queryByList(PersonCollectEOPage page);
public List<PersonCollectEO> queryByPersonCollectPage(PersonCollectEOPage page);
public List<TsPersonCollect> queryByPersonCollectPage(PersonCollectEOPage page);
public String queryCollectByUserAndId(String collectResId);
@@ -20,6 +22,8 @@ public interface IPersonCollectEOService extends IService<PersonCollectEO> {
public int deleteByResId(String resId);
int updateByPrimaryKeySelective(PersonCollectEO personCollectEO) throws Exception;
int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception;
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String modeType, String collectTitle);
}
adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
+43 -10
View File
@@ -1,14 +1,18 @@
package com.adc.da.person.service.impl;
import com.adc.da.base.page.BasePage;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.person.dao.PersonCollectEODao;
import com.adc.da.person.dao.PersonConfEODao;
import com.adc.da.person.dao.PersonNoteEODao;
import com.adc.da.person.entity.PersonCollectEO;
import com.adc.da.person.entity.TsPersonCollect;
import com.adc.da.person.entity.PersonNoteEO;
import com.adc.da.person.page.PersonCollectEOPage;
import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.util.LoginUserUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,7 +32,7 @@ import java.util.List;
*/
@Service("personCollectEOService")
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao, PersonCollectEO> implements IPersonCollectEOService {
public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao, TsPersonCollect> implements IPersonCollectEOService {
@@ -38,8 +42,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
private PersonCollectEODao personCollectEODao;
@Override
public List<PersonCollectEO> queryByPage(PersonCollectEOPage page) {
public List<TsPersonCollect> queryByPage(PersonCollectEOPage page) {
Integer rowCount = this.queryByCount(page);
page.getPager().setRowCount(rowCount);
return this.baseMapper.queryByPage(page);
@@ -50,15 +55,15 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
}
@Override
public List<PersonCollectEO> queryByList(PersonCollectEOPage page) {
public List<TsPersonCollect> queryByList(PersonCollectEOPage page) {
return this.baseMapper.queryByList(page);
}
public List<PersonCollectEO> queryByPersonCollectPage(PersonCollectEOPage page){
public List<TsPersonCollect> queryByPersonCollectPage(PersonCollectEOPage page){
page.setValidFlag("0");
int ire = this.baseMapper.queryByPersonCollectPageCount(page);
page.getPager().setRowCount(ire);
List<PersonCollectEO> list = this.baseMapper.queryByPersonCollectPage(page);
List<TsPersonCollect> list = this.baseMapper.queryByPersonCollectPage(page);
for(int i =0;i<list.size();i++){
PersonNoteEO personNoteEO = new PersonNoteEO();
personNoteEO.setCollectId(list.get(i).getId());
@@ -81,7 +86,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
page.setCollectResId(collectResId);
page.setUserId(userId);
page.setValidFlag("0");
List<PersonCollectEO> getCollects = this.baseMapper.queryByList(page);
List<TsPersonCollect> getCollects = this.baseMapper.queryByList(page);
String collectId = "";
if(getCollects != null){
if(getCollects.size()>0){
@@ -101,7 +106,35 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
}
@Override
public int updateByPrimaryKeySelective(PersonCollectEO personCollectEO) throws Exception{
return personCollectEODao.updateByPrimaryKeySelective(personCollectEO);
public int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception{
return personCollectEODao.updateByPrimaryKeySelective(tsPersonCollect);
}
@Override
public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String userId) {
BasePage basePage = new BasePage();
QueryWrapper<TsPersonCollect> wrapper = new QueryWrapper<>();
wrapper.eq("user_id",userId);
if (collectTitle != null && !collectTitle.equals("")){
wrapper.like("collect_title",collectTitle);
}
if (pageNo != null) {
basePage.setPage(pageNo);
}else{
basePage.setPage(1);
}
if (pageSize != null) {
basePage.setPageSize(pageSize);
}else{
basePage.setPageSize(10);
}
IPage<TsPersonCollect> page = this.page(new Page<>(basePage.getPage(), basePage.getPageSize()), wrapper);
return Result.success(page);
}
}