Browse Source

问卷调查相关接口修改

master
ma 4 years ago
parent
commit
89f34cb679
  1. 21
      src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java
  2. 66
      src/main/java/com/ccsens/carbasics/api/RoleController.java
  3. 8
      src/main/java/com/ccsens/carbasics/bean/dto/RoleDto.java
  4. 106
      src/main/java/com/ccsens/carbasics/bean/po/ButtonConfig.java
  5. 701
      src/main/java/com/ccsens/carbasics/bean/po/ButtonConfigExample.java
  6. 30
      src/main/java/com/ccsens/carbasics/bean/vo/ButtonVO.java
  7. 18
      src/main/java/com/ccsens/carbasics/persist/dao/ButtonConfigDao.java
  8. 8
      src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireDetailDao.java
  9. 18
      src/main/java/com/ccsens/carbasics/persist/dao/RoleCarDao.java
  10. 30
      src/main/java/com/ccsens/carbasics/persist/mapper/ButtonConfigMapper.java
  11. 15
      src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java
  12. 11
      src/main/java/com/ccsens/carbasics/service/IRoleCarService.java
  13. 21
      src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java
  14. 10
      src/main/java/com/ccsens/carbasics/service/RoleCarService.java
  15. 4
      src/main/resources/application.yml
  16. 18
      src/main/resources/mapper_dao/ButtonConfigDao.xml
  17. 5
      src/main/resources/mapper_dao/OrganizationMemberDao.xml
  18. 11
      src/main/resources/mapper_dao/QuestionnaireDetailDao.xml
  19. 34
      src/main/resources/mapper_dao/RoleCarDao.xml
  20. 258
      src/main/resources/mapper_raw/ButtonConfigMapper.xml
  21. 3
      src/main/resources/mbg.xml

21
src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java

@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.CharsetUtil;
import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
import com.ccsens.carbasics.bean.po.Questionnaire;
import com.ccsens.carbasics.bean.vo.ButtonVO;
import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
import com.ccsens.carbasics.service.IQuestionnaireService;
import com.ccsens.cloudutil.annotation.MustLogin;
@ -130,4 +131,24 @@ public class QuestionnaireController {
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, CharsetUtil.UTF_8));
workbook.write(response.getOutputStream());
}
@MustLogin
@ApiOperation(value = "查询首页按钮详情", notes = "")
@RequestMapping(value = "/queryButton", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<ButtonVO.ButtonInfo> queryButton(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{
log.info("查询首页按钮详情{}",params);
ButtonVO.ButtonInfo buttonInfo = questionnaireService.queryButton(params.getUserId());
log.info("查询首页按钮详情结束{}",buttonInfo);
return JsonResponse.newInstance().ok(buttonInfo);
}
@MustLogin
@ApiOperation(value = "查询是否可以进入问卷10.15", notes = "")
@RequestMapping(value = "/queryIsShow", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<ButtonVO.IsShow> queryIsShow(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{
log.info("查询是否可以进入问卷{}",params);
ButtonVO.IsShow isShow = questionnaireService.queryIsShow(params.getUserId());
log.info("查询是否可以进入问卷结束{}",isShow);
return JsonResponse.newInstance().ok(isShow);
}
}

66
src/main/java/com/ccsens/carbasics/api/RoleController.java

@ -2,6 +2,8 @@ package com.ccsens.carbasics.api;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.ccsens.carbasics.bean.dto.RoleDto;
import com.ccsens.carbasics.bean.vo.RoleVo;
import com.ccsens.carbasics.service.IRoleCarService;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.common.bean.dto.CRoleDto;
@ -41,33 +43,33 @@ public class RoleController {
@RequestMapping(value = "/show", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<CRoleVo.QueryRole> queryByProjectId(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.QueryRoleById> params) {
params.getParam().setNum(0);
CRoleVo.QueryRole queryRole = roleService.queryShowRole(params.getParam(), params.getUserId());
// CRoleVo.QueryRole queryRole = roleCarService.queryShowRoleCar(params.getParam(), params.getUserId());
List<CRoleVo.RoleInfo> r1 = new ArrayList<>();
List<CRoleVo.RoleInfo> r2 = new ArrayList<>();
//处理角色,只查看自己所属的角色
if(ObjectUtil.isNotNull(queryRole)){
if(CollectionUtil.isNotEmpty(queryRole.getVisibleList())){
queryRole.getVisibleList().forEach(roleInfo -> {
if(roleInfo.getMine() == 1){
r1.add(roleInfo);
}else {
r2.add(roleInfo);
}
});
}
if(CollectionUtil.isNotEmpty(queryRole.getInvisibleList())){
queryRole.getInvisibleList().forEach(roleInfo -> {
if(roleInfo.getMine() == 1){
r1.add(roleInfo);
}else {
r2.add(roleInfo);
}
});
}
}
queryRole.setVisibleList(r1);
queryRole.setInvisibleList(r2);
// CRoleVo.QueryRole queryRole = roleService.queryShowRole(params.getParam(), params.getUserId());
CRoleVo.QueryRole queryRole = roleCarService.queryShowRoleCar(params.getParam(), params.getUserId());
// List<CRoleVo.RoleInfo> r1 = new ArrayList<>();
// List<CRoleVo.RoleInfo> r2 = new ArrayList<>();
// //处理角色,只查看自己所属的角色
// if(ObjectUtil.isNotNull(queryRole)){
// if(CollectionUtil.isNotEmpty(queryRole.getVisibleList())){
// queryRole.getVisibleList().forEach(roleInfo -> {
// if(roleInfo.getMine() == 1){
// r1.add(roleInfo);
// }else {
// r2.add(roleInfo);
// }
// });
// }
// if(CollectionUtil.isNotEmpty(queryRole.getInvisibleList())){
// queryRole.getInvisibleList().forEach(roleInfo -> {
// if(roleInfo.getMine() == 1){
// r1.add(roleInfo);
// }else {
// r2.add(roleInfo);
// }
// });
// }
// }
// queryRole.setVisibleList(r1);
// queryRole.setInvisibleList(r2);
return JsonResponse.newInstance().ok(queryRole);
}
@ -79,4 +81,14 @@ public class RoleController {
roleService.updateShowRole(params.getParam(),params.getUserId());
return JsonResponse.newInstance().ok();
}
@MustLogin
@ApiOperation(value = "查询确定角色", notes = "")
@RequestMapping(value = "/queryMustShow", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<RoleVo.RoleInfo>> queryMustShow(@ApiParam @Validated @RequestBody QueryDto<RoleDto.QueryMustShow> params) {
log.info("查询确定角色{}",params);
List<RoleVo.RoleInfo> roleInfoList = roleCarService.queryMustShow(params.getParam(),params.getUserId());
log.info("查询确定角色结束{}",roleInfoList);
return JsonResponse.newInstance().ok(roleInfoList);
}
}

8
src/main/java/com/ccsens/carbasics/bean/dto/RoleDto.java

@ -39,4 +39,12 @@ public class RoleDto {
this.userId = userId;
}
}
@Data
@ApiModel("查询四个角色")
public static class QueryMustShow {
@NotNull(message = "项目id不能为空")
@ApiModelProperty("项目id")
private Long projectId;
}
}

106
src/main/java/com/ccsens/carbasics/bean/po/ButtonConfig.java

@ -0,0 +1,106 @@
package com.ccsens.carbasics.bean.po;
import java.io.Serializable;
import java.util.Date;
public class ButtonConfig implements Serializable {
private Long id;
private String name;
private String url;
private Long start;
private Long end;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url == null ? null : url.trim();
}
public Long getStart() {
return start;
}
public void setStart(Long start) {
this.start = start;
}
public Long getEnd() {
return end;
}
public void setEnd(Long end) {
this.end = end;
}
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Byte getRecStatus() {
return recStatus;
}
public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", name=").append(name);
sb.append(", url=").append(url);
sb.append(", start=").append(start);
sb.append(", end=").append(end);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]");
return sb.toString();
}
}

701
src/main/java/com/ccsens/carbasics/bean/po/ButtonConfigExample.java

@ -0,0 +1,701 @@
package com.ccsens.carbasics.bean.po;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class ButtonConfigExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public ButtonConfigExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andNameIsNull() {
addCriterion("name is null");
return (Criteria) this;
}
public Criteria andNameIsNotNull() {
addCriterion("name is not null");
return (Criteria) this;
}
public Criteria andNameEqualTo(String value) {
addCriterion("name =", value, "name");
return (Criteria) this;
}
public Criteria andNameNotEqualTo(String value) {
addCriterion("name <>", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThan(String value) {
addCriterion("name >", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("name >=", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThan(String value) {
addCriterion("name <", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("name <=", value, "name");
return (Criteria) this;
}
public Criteria andNameLike(String value) {
addCriterion("name like", value, "name");
return (Criteria) this;
}
public Criteria andNameNotLike(String value) {
addCriterion("name not like", value, "name");
return (Criteria) this;
}
public Criteria andNameIn(List<String> values) {
addCriterion("name in", values, "name");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> values) {
addCriterion("name not in", values, "name");
return (Criteria) this;
}
public Criteria andNameBetween(String value1, String value2) {
addCriterion("name between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("name not between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andUrlIsNull() {
addCriterion("url is null");
return (Criteria) this;
}
public Criteria andUrlIsNotNull() {
addCriterion("url is not null");
return (Criteria) this;
}
public Criteria andUrlEqualTo(String value) {
addCriterion("url =", value, "url");
return (Criteria) this;
}
public Criteria andUrlNotEqualTo(String value) {
addCriterion("url <>", value, "url");
return (Criteria) this;
}
public Criteria andUrlGreaterThan(String value) {
addCriterion("url >", value, "url");
return (Criteria) this;
}
public Criteria andUrlGreaterThanOrEqualTo(String value) {
addCriterion("url >=", value, "url");
return (Criteria) this;
}
public Criteria andUrlLessThan(String value) {
addCriterion("url <", value, "url");
return (Criteria) this;
}
public Criteria andUrlLessThanOrEqualTo(String value) {
addCriterion("url <=", value, "url");
return (Criteria) this;
}
public Criteria andUrlLike(String value) {
addCriterion("url like", value, "url");
return (Criteria) this;
}
public Criteria andUrlNotLike(String value) {
addCriterion("url not like", value, "url");
return (Criteria) this;
}
public Criteria andUrlIn(List<String> values) {
addCriterion("url in", values, "url");
return (Criteria) this;
}
public Criteria andUrlNotIn(List<String> values) {
addCriterion("url not in", values, "url");
return (Criteria) this;
}
public Criteria andUrlBetween(String value1, String value2) {
addCriterion("url between", value1, value2, "url");
return (Criteria) this;
}
public Criteria andUrlNotBetween(String value1, String value2) {
addCriterion("url not between", value1, value2, "url");
return (Criteria) this;
}
public Criteria andStartIsNull() {
addCriterion("start is null");
return (Criteria) this;
}
public Criteria andStartIsNotNull() {
addCriterion("start is not null");
return (Criteria) this;
}
public Criteria andStartEqualTo(Long value) {
addCriterion("start =", value, "start");
return (Criteria) this;
}
public Criteria andStartNotEqualTo(Long value) {
addCriterion("start <>", value, "start");
return (Criteria) this;
}
public Criteria andStartGreaterThan(Long value) {
addCriterion("start >", value, "start");
return (Criteria) this;
}
public Criteria andStartGreaterThanOrEqualTo(Long value) {
addCriterion("start >=", value, "start");
return (Criteria) this;
}
public Criteria andStartLessThan(Long value) {
addCriterion("start <", value, "start");
return (Criteria) this;
}
public Criteria andStartLessThanOrEqualTo(Long value) {
addCriterion("start <=", value, "start");
return (Criteria) this;
}
public Criteria andStartIn(List<Long> values) {
addCriterion("start in", values, "start");
return (Criteria) this;
}
public Criteria andStartNotIn(List<Long> values) {
addCriterion("start not in", values, "start");
return (Criteria) this;
}
public Criteria andStartBetween(Long value1, Long value2) {
addCriterion("start between", value1, value2, "start");
return (Criteria) this;
}
public Criteria andStartNotBetween(Long value1, Long value2) {
addCriterion("start not between", value1, value2, "start");
return (Criteria) this;
}
public Criteria andEndIsNull() {
addCriterion("end is null");
return (Criteria) this;
}
public Criteria andEndIsNotNull() {
addCriterion("end is not null");
return (Criteria) this;
}
public Criteria andEndEqualTo(Long value) {
addCriterion("end =", value, "end");
return (Criteria) this;
}
public Criteria andEndNotEqualTo(Long value) {
addCriterion("end <>", value, "end");
return (Criteria) this;
}
public Criteria andEndGreaterThan(Long value) {
addCriterion("end >", value, "end");
return (Criteria) this;
}
public Criteria andEndGreaterThanOrEqualTo(Long value) {
addCriterion("end >=", value, "end");
return (Criteria) this;
}
public Criteria andEndLessThan(Long value) {
addCriterion("end <", value, "end");
return (Criteria) this;
}
public Criteria andEndLessThanOrEqualTo(Long value) {
addCriterion("end <=", value, "end");
return (Criteria) this;
}
public Criteria andEndIn(List<Long> values) {
addCriterion("end in", values, "end");
return (Criteria) this;
}
public Criteria andEndNotIn(List<Long> values) {
addCriterion("end not in", values, "end");
return (Criteria) this;
}
public Criteria andEndBetween(Long value1, Long value2) {
addCriterion("end between", value1, value2, "end");
return (Criteria) this;
}
public Criteria andEndNotBetween(Long value1, Long value2) {
addCriterion("end not between", value1, value2, "end");
return (Criteria) this;
}
public Criteria andCreatedAtIsNull() {
addCriterion("created_at is null");
return (Criteria) this;
}
public Criteria andCreatedAtIsNotNull() {
addCriterion("created_at is not null");
return (Criteria) this;
}
public Criteria andCreatedAtEqualTo(Date value) {
addCriterion("created_at =", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotEqualTo(Date value) {
addCriterion("created_at <>", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThan(Date value) {
addCriterion("created_at >", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("created_at >=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThan(Date value) {
addCriterion("created_at <", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
addCriterion("created_at <=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtIn(List<Date> values) {
addCriterion("created_at in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotIn(List<Date> values) {
addCriterion("created_at not in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtBetween(Date value1, Date value2) {
addCriterion("created_at between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
addCriterion("created_at not between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNull() {
addCriterion("updated_at is null");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNotNull() {
addCriterion("updated_at is not null");
return (Criteria) this;
}
public Criteria andUpdatedAtEqualTo(Date value) {
addCriterion("updated_at =", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotEqualTo(Date value) {
addCriterion("updated_at <>", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThan(Date value) {
addCriterion("updated_at >", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("updated_at >=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThan(Date value) {
addCriterion("updated_at <", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
addCriterion("updated_at <=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIn(List<Date> values) {
addCriterion("updated_at in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotIn(List<Date> values) {
addCriterion("updated_at not in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtBetween(Date value1, Date value2) {
addCriterion("updated_at between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
addCriterion("updated_at not between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andRecStatusIsNull() {
addCriterion("rec_status is null");
return (Criteria) this;
}
public Criteria andRecStatusIsNotNull() {
addCriterion("rec_status is not null");
return (Criteria) this;
}
public Criteria andRecStatusEqualTo(Byte value) {
addCriterion("rec_status =", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotEqualTo(Byte value) {
addCriterion("rec_status <>", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThan(Byte value) {
addCriterion("rec_status >", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
addCriterion("rec_status >=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThan(Byte value) {
addCriterion("rec_status <", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
addCriterion("rec_status <=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusIn(List<Byte> values) {
addCriterion("rec_status in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotIn(List<Byte> values) {
addCriterion("rec_status not in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusBetween(Byte value1, Byte value2) {
addCriterion("rec_status between", value1, value2, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
addCriterion("rec_status not between", value1, value2, "recStatus");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

30
src/main/java/com/ccsens/carbasics/bean/vo/ButtonVO.java

@ -0,0 +1,30 @@
package com.ccsens.carbasics.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author AUSU
*/
@Data
public class ButtonVO {
@Data
@ApiModel("按钮信息")
public static class ButtonInfo{
@ApiModelProperty("按钮名称")
private String name;
@ApiModelProperty("跳转路径")
private String url;
}
@Data
@ApiModel("是否显示问卷")
public static class IsShow{
@ApiModelProperty("0-否,1-是")
private Byte showStatus;
@ApiModelProperty("问卷详情id")
private Long detailId;
}
}

18
src/main/java/com/ccsens/carbasics/persist/dao/ButtonConfigDao.java

@ -0,0 +1,18 @@
package com.ccsens.carbasics.persist.dao;
import com.ccsens.carbasics.bean.vo.ButtonVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
/**
* @author AUSU
*/
@Repository
public interface ButtonConfigDao {
/**
* 查询首页按钮当前时间信息
* @param currentTime 当前时间
* @return 按钮信息
*/
ButtonVO.ButtonInfo queryButtonInfo(@Param("time") long currentTime);
}

8
src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireDetailDao.java

@ -1,5 +1,6 @@
package com.ccsens.carbasics.persist.dao;
import com.ccsens.carbasics.bean.vo.ButtonVO;
import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
import com.ccsens.carbasics.persist.mapper.QuestionnaireDetailMapper;
import io.lettuce.core.dynamic.annotation.Key;
@ -72,4 +73,11 @@ public interface QuestionnaireDetailDao extends QuestionnaireDetailMapper {
* @return 提交人信息
*/
List<QuestionnaireVo.QuestionnaireInfo> querySubmitter(@Param("submitId") Long submitId);
/**
* 查询是否展示问卷按钮(临时)
* @param userId 用户id
* @return 是否展示状态
*/
ButtonVO.IsShow queryIsShow(@Param("userId") Long userId);
}

18
src/main/java/com/ccsens/carbasics/persist/dao/RoleCarDao.java

@ -0,0 +1,18 @@
package com.ccsens.carbasics.persist.dao;
import com.ccsens.carbasics.bean.dto.RoleDto;
import com.ccsens.carbasics.bean.vo.RoleVo;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface RoleCarDao {
/**
* 查询四个角色(卒中中心主任/质控医生/神内医生/分诊护士)
* @param param 项目id
* @return 角色信息
*/
List<RoleVo.RoleInfo> queryMustShow(RoleDto.QueryMustShow param);
}

30
src/main/java/com/ccsens/carbasics/persist/mapper/ButtonConfigMapper.java

@ -0,0 +1,30 @@
package com.ccsens.carbasics.persist.mapper;
import com.ccsens.carbasics.bean.po.ButtonConfig;
import com.ccsens.carbasics.bean.po.ButtonConfigExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ButtonConfigMapper {
long countByExample(ButtonConfigExample example);
int deleteByExample(ButtonConfigExample example);
int deleteByPrimaryKey(Long id);
int insert(ButtonConfig record);
int insertSelective(ButtonConfig record);
List<ButtonConfig> selectByExample(ButtonConfigExample example);
ButtonConfig selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") ButtonConfig record, @Param("example") ButtonConfigExample example);
int updateByExample(@Param("record") ButtonConfig record, @Param("example") ButtonConfigExample example);
int updateByPrimaryKeySelective(ButtonConfig record);
int updateByPrimaryKey(ButtonConfig record);
}

15
src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java

@ -2,6 +2,7 @@ package com.ccsens.carbasics.service;
import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
import com.ccsens.carbasics.bean.vo.ButtonVO;
import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
import org.apache.poi.ss.usermodel.Workbook;
@ -79,4 +80,18 @@ public interface IQuestionnaireService {
* @return 问卷
*/
Workbook export(QuestionnaireDto.Export export) throws IOException;
/**
* 查询首页按钮信息
* @param userId 用户id
* @return 按钮信息
*/
ButtonVO.ButtonInfo queryButton(Long userId);
/**
* 查询是否展示问卷调查(临时)
* @param userId 用户id
* @return 是否展示
*/
ButtonVO.IsShow queryIsShow(Long userId);
}

11
src/main/java/com/ccsens/carbasics/service/IRoleCarService.java

@ -1,8 +1,12 @@
package com.ccsens.carbasics.service;
import com.ccsens.carbasics.bean.dto.RoleDto;
import com.ccsens.carbasics.bean.vo.RoleVo;
import com.ccsens.common.bean.dto.CRoleDto;
import com.ccsens.common.bean.vo.CRoleVo;
import java.util.List;
/**
* @author AUSU
*/
@ -15,4 +19,11 @@ public interface IRoleCarService {
*/
CRoleVo.QueryRole queryShowRoleCar(CRoleDto.QueryRoleById param, Long userId);
/**
* 查询四个角色
* @param param 项目id
* @param userId 用户id
* @return 角色信息
*/
List<RoleVo.RoleInfo> queryMustShow(RoleDto.QueryMustShow param, Long userId);
}

21
src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java

@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
import com.ccsens.carbasics.bean.dto.PatientDto;
import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
import com.ccsens.carbasics.bean.po.*;
import com.ccsens.carbasics.bean.vo.ButtonVO;
import com.ccsens.carbasics.bean.vo.CodeVo;
import com.ccsens.carbasics.bean.vo.OrganizationMemberVo;
import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
@ -79,6 +80,8 @@ public class QuestionnaireService implements IQuestionnaireService{
@Resource
private CodeDictionariesDao codeDictionariesDao;
@Resource
private ButtonConfigDao buttonConfigDao;
@Resource
private RedisUtil redisUtil;
@Resource
private Tall3FeignClient tall3FeignClient;
@ -523,4 +526,22 @@ public class QuestionnaireService implements IQuestionnaireService{
}
}
@Override
public ButtonVO.ButtonInfo queryButton(Long userId) {
return buttonConfigDao.queryButtonInfo(System.currentTimeMillis());
}
@Override
public ButtonVO.IsShow queryIsShow(Long userId) {
ButtonVO.IsShow isShow = questionnaireDetailDao.queryIsShow(userId);
if (ObjectUtil.isNotNull(isShow)) {
isShow.setShowStatus((byte) 1);
} else {
ButtonVO.IsShow result = new ButtonVO.IsShow();
result.setShowStatus((byte) 0);
return result;
}
return isShow;
}
}

10
src/main/java/com/ccsens/carbasics/service/RoleCarService.java

@ -3,6 +3,9 @@ package com.ccsens.carbasics.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.ccsens.carbasics.bean.dto.RoleDto;
import com.ccsens.carbasics.bean.vo.RoleVo;
import com.ccsens.carbasics.persist.dao.RoleCarDao;
import com.ccsens.carbasics.util.Constant;
import com.ccsens.common.bean.dto.CRoleDto;
import com.ccsens.common.bean.po.ProRole;
@ -27,6 +30,8 @@ public class RoleCarService implements IRoleCarService {
@Resource
private ProRoleDao proRoleDao;
@Resource
private RoleCarDao roleCarDao;
@Override
public CRoleVo.QueryRole queryShowRoleCar(CRoleDto.QueryRoleById param, Long userId) {
@ -66,4 +71,9 @@ public class RoleCarService implements IRoleCarService {
return queryRole;
}
@Override
public List<RoleVo.RoleInfo> queryMustShow(RoleDto.QueryMustShow param, Long userId) {
return roleCarDao.queryMustShow(param);
}
}

4
src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: dev
include: common, util-dev
active: test
include: common, util-test

18
src/main/resources/mapper_dao/ButtonConfigDao.xml

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.carbasics.persist.dao.ButtonConfigDao">
<select id="queryButtonInfo" resultType="com.ccsens.carbasics.bean.vo.ButtonVO$ButtonInfo">
SELECT
`name`,
url
FROM
t_qcp_button_config
WHERE
rec_status = 0
AND `start` &lt; #{time}
AND `end` &gt; #{time}
</select>
</mapper>

5
src/main/resources/mapper_dao/OrganizationMemberDao.xml

@ -33,13 +33,16 @@
t_organization_member_position mp,
t_organization_position p,
t_organization_department d,
t_organization o
t_organization o,
t_organization_project op
WHERE
m.user_id = #{userId}
and m.id = mp.member_id
and mp.position_id = p.id
and mp.department_id = d.id
and d.organization_id = o.id
AND op.organization_id = o.id
AND op.project_id = #{projectId}
and m.rec_status = 0
and mp.rec_status = 0
and p.rec_status = 0

11
src/main/resources/mapper_dao/QuestionnaireDetailDao.xml

@ -118,4 +118,15 @@
)
</select>
<select id="queryIsShow" resultType="com.ccsens.carbasics.bean.vo.ButtonVO$IsShow">
SELECT
questionnaire_detail_id AS detailId
FROM
t_qcp_questionnaire_temp
WHERE
rec_status = 0
AND
user_id = #{userId}
</select>
</mapper>

34
src/main/resources/mapper_dao/RoleCarDao.xml

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.carbasics.persist.dao.RoleCarDao">
<select id="queryMustShow" resultType="com.ccsens.carbasics.bean.vo.RoleVo$RoleInfo">
SELECT
id,
`name`,
CASE `name`
WHEN '卒中中心主任' THEN
1
WHEN '质控医生' THEN
2
WHEN '神内医生' THEN
3
WHEN '分诊护士' THEN
4
END AS sort
FROM
t_pro_role
WHERE
rec_status = 0
AND project_id = #{projectId}
AND `name` IN (
'卒中中心主任',
'质控医生',
'神内医生',
'分诊护士'
)
ORDER BY
sort
</select>
</mapper>

258
src/main/resources/mapper_raw/ButtonConfigMapper.xml

@ -0,0 +1,258 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.carbasics.persist.mapper.ButtonConfigMapper">
<resultMap id="BaseResultMap" type="com.ccsens.carbasics.bean.po.ButtonConfig">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="url" jdbcType="VARCHAR" property="url" />
<result column="start" jdbcType="BIGINT" property="start" />
<result column="end" jdbcType="BIGINT" property="end" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, name, url, start, end, created_at, updated_at, rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.ButtonConfigExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from t_qcp_button_config
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from t_qcp_button_config
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from t_qcp_button_config
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.carbasics.bean.po.ButtonConfigExample">
delete from t_qcp_button_config
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.carbasics.bean.po.ButtonConfig">
insert into t_qcp_button_config (id, name, url,
start, end, created_at,
updated_at, rec_status)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR},
#{start,jdbcType=BIGINT}, #{end,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP},
#{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.ButtonConfig">
insert into t_qcp_button_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="url != null">
url,
</if>
<if test="start != null">
start,
</if>
<if test="end != null">
end,
</if>
<if test="createdAt != null">
created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="url != null">
#{url,jdbcType=VARCHAR},
</if>
<if test="start != null">
#{start,jdbcType=BIGINT},
</if>
<if test="end != null">
#{end,jdbcType=BIGINT},
</if>
<if test="createdAt != null">
#{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
#{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
#{recStatus,jdbcType=TINYINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.ButtonConfigExample" resultType="java.lang.Long">
select count(*) from t_qcp_button_config
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update t_qcp_button_config
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.url != null">
url = #{record.url,jdbcType=VARCHAR},
</if>
<if test="record.start != null">
start = #{record.start,jdbcType=BIGINT},
</if>
<if test="record.end != null">
end = #{record.end,jdbcType=BIGINT},
</if>
<if test="record.createdAt != null">
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</if>
<if test="record.updatedAt != null">
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="record.recStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update t_qcp_button_config
set id = #{record.id,jdbcType=BIGINT},
name = #{record.name,jdbcType=VARCHAR},
url = #{record.url,jdbcType=VARCHAR},
start = #{record.start,jdbcType=BIGINT},
end = #{record.end,jdbcType=BIGINT},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.carbasics.bean.po.ButtonConfig">
update t_qcp_button_config
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="url != null">
url = #{url,jdbcType=VARCHAR},
</if>
<if test="start != null">
start = #{start,jdbcType=BIGINT},
</if>
<if test="end != null">
end = #{end,jdbcType=BIGINT},
</if>
<if test="createdAt != null">
created_at = #{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.carbasics.bean.po.ButtonConfig">
update t_qcp_button_config
set name = #{name,jdbcType=VARCHAR},
url = #{url,jdbcType=VARCHAR},
start = #{start,jdbcType=BIGINT},
end = #{end,jdbcType=BIGINT},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

3
src/main/resources/mbg.xml

@ -61,7 +61,8 @@
<!-- <table tableName="t_qcp_ocr_keyword_option" domainObjectName="OcrKeywordOption"></table>-->
<!-- <table tableName="t_qcp_questionnaire" domainObjectName="Questionnaire"></table>-->
<!-- <table tableName="t_qcp_questionnaire_detail" domainObjectName="QuestionnaireDetail"></table>-->
<table tableName="t_qcp_questionnaire_record" domainObjectName="QuestionnaireRecord"></table>
<!-- <table tableName="t_qcp_questionnaire_record" domainObjectName="QuestionnaireRecord"></table>-->
<table tableName="t_qcp_button_config" domainObjectName="ButtonConfig"></table>
<!-- <table tableName="t_area" domainObjectName="Area"></table>-->
<!-- <table tableName="t_organization_department" domainObjectName="OrganizationDepartment"></table>-->
<!-- <table tableName="t_organization_member" domainObjectName="OrganizationMember"></table>-->

Loading…
Cancel
Save