Browse Source

修改租户用户密码完成

newMaster
zzc 5 months ago
parent
commit
74613e0e98
  1. 21
      acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java
  2. 10
      acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/RmsReportController.java
  3. 16
      acupuncture-common/pom.xml
  4. 40
      acupuncture-common/src/main/java/com/acupuncture/common/core/domain/BaseDto.java
  5. 66
      acupuncture-common/src/main/java/com/acupuncture/common/core/domain/JsonResponse.java
  6. 44
      acupuncture-framework/src/main/java/com/acupuncture/framework/config/ApplicationConfig.java
  7. 37
      acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/SysPasswordService.java
  8. 2
      acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/UserDetailsServiceImpl.java
  9. 1
      acupuncture-generator/src/main/resources/mbg.xml
  10. 150
      acupuncture-system/src/main/java/com/acupuncture/system/domain/po/RmsReportManagement.java
  11. 988
      acupuncture-system/src/main/java/com/acupuncture/system/domain/po/RmsReportManagementExample.java
  12. 12
      acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java
  13. 49
      acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/RmsReportVo.java
  14. 8
      acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/DmsUserDao.java
  15. 28
      acupuncture-system/src/main/java/com/acupuncture/system/persist/mapper/RmsReportManagementMapper.java
  16. 8
      acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java
  17. 24
      acupuncture-system/src/main/java/com/acupuncture/system/service/RmsReportService.java
  18. 5
      acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java
  19. 24
      acupuncture-system/src/main/java/com/acupuncture/system/service/impl/RmsReportServiceImpl.java
  20. 24
      acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml
  21. 317
      acupuncture-system/src/main/resources/mapper/system/RmsReportManagementMapper.xml

21
acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java

@ -1,17 +1,23 @@
package com.acupuncture.web.controller.web;
import com.acupuncture.common.annotation.Log;
import com.acupuncture.common.constant.Constants;
import com.acupuncture.common.core.domain.AjaxResult;
import com.acupuncture.common.core.domain.JsonResponse;
import com.acupuncture.common.core.domain.entity.SysUser;
import com.acupuncture.common.core.domain.model.LoginBody;
import com.acupuncture.common.core.domain.model.LoginUser;
import com.acupuncture.common.enums.BusinessType;
import com.acupuncture.common.utils.SecurityUtils;
import com.acupuncture.framework.web.service.SysPermissionService;
import com.acupuncture.framework.web.service.TokenService;
import com.acupuncture.framework.web.service.WebDmsLoginService;
import com.acupuncture.system.domain.vo.DmsLoginUserVo;
import com.acupuncture.system.service.DmsLoginService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -33,10 +39,10 @@ public class DmsLoginController {
private WebDmsLoginService webDmsLoginService;
@Resource
private SysPermissionService permissionService;
@Resource
private TokenService tokenService;
@Resource
private DmsLoginService dmsLoginService;
/**
* 登录方法
@ -76,12 +82,19 @@ public class DmsLoginController {
}
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
ajax.put("tenantId", loginUser.getTenantId());
ajax.put("scoreId", loginUser.getScoreId());
return ajax;
}
@PutMapping("/resetPwd")
public JsonResponse<Integer> resetPwd(@RequestBody DmsLoginUserVo.DmsUserVo user)
{
// webDmsLoginService.checkUserAllowed(user);
// webDmsLoginService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return JsonResponse.ok(dmsLoginService.resetPwd(user));
}
}

10
acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/RmsReportController.java

@ -0,0 +1,10 @@
package com.acupuncture.web.controller.web;
/**
* @Author zzc
* @Package com.acupuncture.web.controller.web
* @Date 2025/2/10 15:58
* @description:
*/
public class RmsReportController {
}

16
acupuncture-common/pom.xml

@ -118,6 +118,22 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.6.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.24</version>
<scope>compile</scope>
</dependency>
</dependencies>

40
acupuncture-common/src/main/java/com/acupuncture/common/core/domain/BaseDto.java

@ -0,0 +1,40 @@
package com.acupuncture.common.core.domain;
import cn.hutool.core.util.StrUtil;
import com.acupuncture.common.utils.StringUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
/**
* @author zzc
* @date Created in 2022/11/14 17:18
* @version:
*/
@Data
@ApiModel("通用传参")
public class BaseDto<T> {
@ApiModelProperty("页数 -1代表不分页")
private Integer pageNum = 1;
@ApiModelProperty("每页条数")
private Integer pageSize = 10;
@ApiModelProperty("排序 (eg: id asc, nickName desc)")
private String sort;
@ApiModelProperty("实际参数")
@NotNull(message = "param不能为空")
@Valid
private T param;
public String getOrderBy() {
if (StrUtil.isNotBlank(sort)) {
return StringUtils.toUnderScoreCase(sort);
}
return "";
}
}

66
acupuncture-common/src/main/java/com/acupuncture/common/core/domain/JsonResponse.java

@ -0,0 +1,66 @@
package com.acupuncture.common.core.domain;
import com.acupuncture.common.constant.HttpStatus;
import lombok.Data;
/**
* @author zhangsan
*/
@Data
public class JsonResponse<T> {
public static final Integer CODE_SUCCESS = HttpStatus.SUCCESS;
public static final Integer CODE_FAIL = HttpStatus.ERROR;
public static final String MSG_SUCCESS = "操作成功";
public static final String MSG_FAIL = "操作失败";
private Integer code;
private T data;
private String msg;
public static <T> JsonResponse<Integer> ok() {
JsonResponse<Integer> jsonResponse = new JsonResponse<>();
jsonResponse.code = CODE_SUCCESS;
jsonResponse.msg = MSG_SUCCESS;
jsonResponse.data = null;
return jsonResponse;
}
public static <T> JsonResponse<T> ok(T data) {
JsonResponse<T> jsonResponse = new JsonResponse<>();
jsonResponse.code = CODE_SUCCESS;
jsonResponse.msg = MSG_SUCCESS;
jsonResponse.data = data;
return jsonResponse;
}
public <T> JsonResponse<Integer> fail() {
JsonResponse<Integer> jsonResponse = new JsonResponse<>();
jsonResponse.code = CODE_FAIL;
jsonResponse.msg = MSG_FAIL;
jsonResponse.data = null;
return jsonResponse;
}
public <T> JsonResponse<Integer> fail(String msg) {
JsonResponse<Integer> jsonResponse = new JsonResponse<>();
jsonResponse.code = CODE_FAIL;
jsonResponse.msg = msg;
jsonResponse.data = null;
return jsonResponse;
}
/*
public <T> JsonResponse<Integer> fail(int code, String msg) {
JsonResponse<Integer> jsonResponse = new JsonResponse<>();
jsonResponse.code = code;
jsonResponse.msg = msg;
jsonResponse.data = null;
return jsonResponse;
}*/
public <T> JsonResponse<T> fail(int code, String msg) {
JsonResponse<T> jsonResponse = new JsonResponse<>();
jsonResponse.code = code;
jsonResponse.msg = msg;
jsonResponse.data = null;
return jsonResponse;
}
}

44
acupuncture-framework/src/main/java/com/acupuncture/framework/config/ApplicationConfig.java

@ -1,6 +1,19 @@
package com.acupuncture.framework.config;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.TimeZone;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.context.annotation.Bean;
@ -23,8 +36,33 @@ public class ApplicationConfig
* 时区配置
*/
@Bean
public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
{
return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() {
// return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault())
//包装类型Long
.serializerByType(Long.class, ToStringSerializer.instance)
//基本类型long不转换,一般是total之类的字段要用
// .serializerByType(Long.TYPE, ToStringSerializer.instance)
//日期类型序列化
.serializerByType(LocalDateTime.class,
new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
.serializerByType(LocalDate.class,
new LocalDateSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
.serializerByType(LocalTime.class,
new LocalTimeSerializer(DateTimeFormatter.ofPattern("HH:mm:ss")))
//日期类型反序列化
.deserializerByType(LocalDateTime.class,
new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
.deserializerByType(LocalDate.class,
new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
.deserializerByType(LocalTime.class,
new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")))
.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
//不包含空值
//.serializationInclusion(JsonInclude.Include.NON_NULL)
//指定日期格式
.simpleDateFormat("yyyy-MM-dd HH:mm:ss")
//忽略未知字段
.failOnUnknownProperties(false);
}
}

37
acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/SysPasswordService.java

@ -1,6 +1,8 @@
package com.acupuncture.framework.web.service;
import java.util.concurrent.TimeUnit;
import com.acupuncture.system.domain.vo.DmsLoginUserVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication;
@ -71,11 +73,46 @@ public class SysPasswordService
}
}
public void validate(DmsLoginUserVo.DataScoreVo user)
{
Authentication usernamePasswordAuthenticationToken = AuthenticationContextHolder.getContext();
String username = usernamePasswordAuthenticationToken.getName();
String password = usernamePasswordAuthenticationToken.getCredentials().toString();
Integer retryCount = redisCache.getCacheObject(getCacheKey(username));
if (retryCount == null)
{
retryCount = 0;
}
if (retryCount >= Integer.valueOf(maxRetryCount).intValue())
{
throw new UserPasswordRetryLimitExceedException(maxRetryCount, lockTime);
}
if (!matches(user, password))
{
retryCount = retryCount + 1;
redisCache.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);
throw new UserPasswordNotMatchException();
}
else
{
clearLoginRecordCache(username);
}
}
public boolean matches(SysUser user, String rawPassword)
{
return SecurityUtils.matchesPassword(rawPassword, user.getPassword());
}
public boolean matches(DmsLoginUserVo.DataScoreVo user, String rawPassword)
{
return SecurityUtils.matchesPassword(rawPassword, user.getPassword());
}
public void clearLoginRecordCache(String loginName)
{
if (redisCache.hasKey(getCacheKey(loginName)))

2
acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/UserDetailsServiceImpl.java

@ -86,7 +86,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
throw new ServiceException(MessageUtils.message("user.blocked"));
}
// passwordService.validate(user);
passwordService.validate(dataScoreVo);
return createLoginUser(dataScoreVo);
}

1
acupuncture-generator/src/main/resources/mbg.xml

@ -66,6 +66,7 @@
<table tableName="pms_treatment" domainObjectName="PmsTreatment" enableDeleteByExample="false"/>
<table tableName="pms_treatment_record" domainObjectName="PmsTreatmentRecord" enableDeleteByExample="false"/>
<table tableName="rms_report_type" domainObjectName="RmsReportType" enableDeleteByExample="false"/>
<table tableName="rms_report_management" domainObjectName="RmsReportManagement" enableDeleteByExample="false"/>
<table tableName="ums_data_source" domainObjectName="UmsDataSource" enableDeleteByExample="false"/>
<!-- 有些表的字段需要指定java类型

150
acupuncture-system/src/main/java/com/acupuncture/system/domain/po/RmsReportManagement.java

@ -0,0 +1,150 @@
package com.acupuncture.system.domain.po;
import java.io.Serializable;
import java.util.Date;
public class RmsReportManagement implements Serializable {
private Long id;
private String reportTitle;
private Long reportType;
private Date timeRangeStart;
private Date timeRangeEnd;
private Byte status;
private Byte delFlag;
private String createBy;
private Date createTime;
private String updateBy;
private Date updateTime;
private String remark;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getReportTitle() {
return reportTitle;
}
public void setReportTitle(String reportTitle) {
this.reportTitle = reportTitle == null ? null : reportTitle.trim();
}
public Long getReportType() {
return reportType;
}
public void setReportType(Long reportType) {
this.reportType = reportType;
}
public Date getTimeRangeStart() {
return timeRangeStart;
}
public void setTimeRangeStart(Date timeRangeStart) {
this.timeRangeStart = timeRangeStart;
}
public Date getTimeRangeEnd() {
return timeRangeEnd;
}
public void setTimeRangeEnd(Date timeRangeEnd) {
this.timeRangeEnd = timeRangeEnd;
}
public Byte getStatus() {
return status;
}
public void setStatus(Byte status) {
this.status = status;
}
public Byte getDelFlag() {
return delFlag;
}
public void setDelFlag(Byte delFlag) {
this.delFlag = delFlag;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy == null ? null : createBy.trim();
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy == null ? null : updateBy.trim();
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
@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(", reportTitle=").append(reportTitle);
sb.append(", reportType=").append(reportType);
sb.append(", timeRangeStart=").append(timeRangeStart);
sb.append(", timeRangeEnd=").append(timeRangeEnd);
sb.append(", status=").append(status);
sb.append(", delFlag=").append(delFlag);
sb.append(", createBy=").append(createBy);
sb.append(", createTime=").append(createTime);
sb.append(", updateBy=").append(updateBy);
sb.append(", updateTime=").append(updateTime);
sb.append(", remark=").append(remark);
sb.append("]");
return sb.toString();
}
}

988
acupuncture-system/src/main/java/com/acupuncture/system/domain/po/RmsReportManagementExample.java

@ -0,0 +1,988 @@
package com.acupuncture.system.domain.po;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
public class RmsReportManagementExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public RmsReportManagementExample() {
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));
}
protected void addCriterionForJDBCDate(String condition, Date value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
addCriterion(condition, new java.sql.Date(value.getTime()), property);
}
protected void addCriterionForJDBCDate(String condition, List<Date> values, String property) {
if (values == null || values.size() == 0) {
throw new RuntimeException("Value list for " + property + " cannot be null or empty");
}
List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
Iterator<Date> iter = values.iterator();
while (iter.hasNext()) {
dateList.add(new java.sql.Date(iter.next().getTime()));
}
addCriterion(condition, dateList, property);
}
protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property);
}
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 andReportTitleIsNull() {
addCriterion("report_title is null");
return (Criteria) this;
}
public Criteria andReportTitleIsNotNull() {
addCriterion("report_title is not null");
return (Criteria) this;
}
public Criteria andReportTitleEqualTo(String value) {
addCriterion("report_title =", value, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleNotEqualTo(String value) {
addCriterion("report_title <>", value, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleGreaterThan(String value) {
addCriterion("report_title >", value, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleGreaterThanOrEqualTo(String value) {
addCriterion("report_title >=", value, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleLessThan(String value) {
addCriterion("report_title <", value, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleLessThanOrEqualTo(String value) {
addCriterion("report_title <=", value, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleLike(String value) {
addCriterion("report_title like", value, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleNotLike(String value) {
addCriterion("report_title not like", value, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleIn(List<String> values) {
addCriterion("report_title in", values, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleNotIn(List<String> values) {
addCriterion("report_title not in", values, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleBetween(String value1, String value2) {
addCriterion("report_title between", value1, value2, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTitleNotBetween(String value1, String value2) {
addCriterion("report_title not between", value1, value2, "reportTitle");
return (Criteria) this;
}
public Criteria andReportTypeIsNull() {
addCriterion("report_type is null");
return (Criteria) this;
}
public Criteria andReportTypeIsNotNull() {
addCriterion("report_type is not null");
return (Criteria) this;
}
public Criteria andReportTypeEqualTo(Long value) {
addCriterion("report_type =", value, "reportType");
return (Criteria) this;
}
public Criteria andReportTypeNotEqualTo(Long value) {
addCriterion("report_type <>", value, "reportType");
return (Criteria) this;
}
public Criteria andReportTypeGreaterThan(Long value) {
addCriterion("report_type >", value, "reportType");
return (Criteria) this;
}
public Criteria andReportTypeGreaterThanOrEqualTo(Long value) {
addCriterion("report_type >=", value, "reportType");
return (Criteria) this;
}
public Criteria andReportTypeLessThan(Long value) {
addCriterion("report_type <", value, "reportType");
return (Criteria) this;
}
public Criteria andReportTypeLessThanOrEqualTo(Long value) {
addCriterion("report_type <=", value, "reportType");
return (Criteria) this;
}
public Criteria andReportTypeIn(List<Long> values) {
addCriterion("report_type in", values, "reportType");
return (Criteria) this;
}
public Criteria andReportTypeNotIn(List<Long> values) {
addCriterion("report_type not in", values, "reportType");
return (Criteria) this;
}
public Criteria andReportTypeBetween(Long value1, Long value2) {
addCriterion("report_type between", value1, value2, "reportType");
return (Criteria) this;
}
public Criteria andReportTypeNotBetween(Long value1, Long value2) {
addCriterion("report_type not between", value1, value2, "reportType");
return (Criteria) this;
}
public Criteria andTimeRangeStartIsNull() {
addCriterion("time_range_start is null");
return (Criteria) this;
}
public Criteria andTimeRangeStartIsNotNull() {
addCriterion("time_range_start is not null");
return (Criteria) this;
}
public Criteria andTimeRangeStartEqualTo(Date value) {
addCriterionForJDBCDate("time_range_start =", value, "timeRangeStart");
return (Criteria) this;
}
public Criteria andTimeRangeStartNotEqualTo(Date value) {
addCriterionForJDBCDate("time_range_start <>", value, "timeRangeStart");
return (Criteria) this;
}
public Criteria andTimeRangeStartGreaterThan(Date value) {
addCriterionForJDBCDate("time_range_start >", value, "timeRangeStart");
return (Criteria) this;
}
public Criteria andTimeRangeStartGreaterThanOrEqualTo(Date value) {
addCriterionForJDBCDate("time_range_start >=", value, "timeRangeStart");
return (Criteria) this;
}
public Criteria andTimeRangeStartLessThan(Date value) {
addCriterionForJDBCDate("time_range_start <", value, "timeRangeStart");
return (Criteria) this;
}
public Criteria andTimeRangeStartLessThanOrEqualTo(Date value) {
addCriterionForJDBCDate("time_range_start <=", value, "timeRangeStart");
return (Criteria) this;
}
public Criteria andTimeRangeStartIn(List<Date> values) {
addCriterionForJDBCDate("time_range_start in", values, "timeRangeStart");
return (Criteria) this;
}
public Criteria andTimeRangeStartNotIn(List<Date> values) {
addCriterionForJDBCDate("time_range_start not in", values, "timeRangeStart");
return (Criteria) this;
}
public Criteria andTimeRangeStartBetween(Date value1, Date value2) {
addCriterionForJDBCDate("time_range_start between", value1, value2, "timeRangeStart");
return (Criteria) this;
}
public Criteria andTimeRangeStartNotBetween(Date value1, Date value2) {
addCriterionForJDBCDate("time_range_start not between", value1, value2, "timeRangeStart");
return (Criteria) this;
}
public Criteria andTimeRangeEndIsNull() {
addCriterion("time_range_end is null");
return (Criteria) this;
}
public Criteria andTimeRangeEndIsNotNull() {
addCriterion("time_range_end is not null");
return (Criteria) this;
}
public Criteria andTimeRangeEndEqualTo(Date value) {
addCriterionForJDBCDate("time_range_end =", value, "timeRangeEnd");
return (Criteria) this;
}
public Criteria andTimeRangeEndNotEqualTo(Date value) {
addCriterionForJDBCDate("time_range_end <>", value, "timeRangeEnd");
return (Criteria) this;
}
public Criteria andTimeRangeEndGreaterThan(Date value) {
addCriterionForJDBCDate("time_range_end >", value, "timeRangeEnd");
return (Criteria) this;
}
public Criteria andTimeRangeEndGreaterThanOrEqualTo(Date value) {
addCriterionForJDBCDate("time_range_end >=", value, "timeRangeEnd");
return (Criteria) this;
}
public Criteria andTimeRangeEndLessThan(Date value) {
addCriterionForJDBCDate("time_range_end <", value, "timeRangeEnd");
return (Criteria) this;
}
public Criteria andTimeRangeEndLessThanOrEqualTo(Date value) {
addCriterionForJDBCDate("time_range_end <=", value, "timeRangeEnd");
return (Criteria) this;
}
public Criteria andTimeRangeEndIn(List<Date> values) {
addCriterionForJDBCDate("time_range_end in", values, "timeRangeEnd");
return (Criteria) this;
}
public Criteria andTimeRangeEndNotIn(List<Date> values) {
addCriterionForJDBCDate("time_range_end not in", values, "timeRangeEnd");
return (Criteria) this;
}
public Criteria andTimeRangeEndBetween(Date value1, Date value2) {
addCriterionForJDBCDate("time_range_end between", value1, value2, "timeRangeEnd");
return (Criteria) this;
}
public Criteria andTimeRangeEndNotBetween(Date value1, Date value2) {
addCriterionForJDBCDate("time_range_end not between", value1, value2, "timeRangeEnd");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("status is null");
return (Criteria) this;
}
public Criteria andStatusIsNotNull() {
addCriterion("status is not null");
return (Criteria) this;
}
public Criteria andStatusEqualTo(Byte value) {
addCriterion("status =", value, "status");
return (Criteria) this;
}
public Criteria andStatusNotEqualTo(Byte value) {
addCriterion("status <>", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThan(Byte value) {
addCriterion("status >", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
addCriterion("status >=", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThan(Byte value) {
addCriterion("status <", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThanOrEqualTo(Byte value) {
addCriterion("status <=", value, "status");
return (Criteria) this;
}
public Criteria andStatusIn(List<Byte> values) {
addCriterion("status in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<Byte> values) {
addCriterion("status not in", values, "status");
return (Criteria) this;
}
public Criteria andStatusBetween(Byte value1, Byte value2) {
addCriterion("status between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andStatusNotBetween(Byte value1, Byte value2) {
addCriterion("status not between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andDelFlagIsNull() {
addCriterion("del_flag is null");
return (Criteria) this;
}
public Criteria andDelFlagIsNotNull() {
addCriterion("del_flag is not null");
return (Criteria) this;
}
public Criteria andDelFlagEqualTo(Byte value) {
addCriterion("del_flag =", value, "delFlag");
return (Criteria) this;
}
public Criteria andDelFlagNotEqualTo(Byte value) {
addCriterion("del_flag <>", value, "delFlag");
return (Criteria) this;
}
public Criteria andDelFlagGreaterThan(Byte value) {
addCriterion("del_flag >", value, "delFlag");
return (Criteria) this;
}
public Criteria andDelFlagGreaterThanOrEqualTo(Byte value) {
addCriterion("del_flag >=", value, "delFlag");
return (Criteria) this;
}
public Criteria andDelFlagLessThan(Byte value) {
addCriterion("del_flag <", value, "delFlag");
return (Criteria) this;
}
public Criteria andDelFlagLessThanOrEqualTo(Byte value) {
addCriterion("del_flag <=", value, "delFlag");
return (Criteria) this;
}
public Criteria andDelFlagIn(List<Byte> values) {
addCriterion("del_flag in", values, "delFlag");
return (Criteria) this;
}
public Criteria andDelFlagNotIn(List<Byte> values) {
addCriterion("del_flag not in", values, "delFlag");
return (Criteria) this;
}
public Criteria andDelFlagBetween(Byte value1, Byte value2) {
addCriterion("del_flag between", value1, value2, "delFlag");
return (Criteria) this;
}
public Criteria andDelFlagNotBetween(Byte value1, Byte value2) {
addCriterion("del_flag not between", value1, value2, "delFlag");
return (Criteria) this;
}
public Criteria andCreateByIsNull() {
addCriterion("create_by is null");
return (Criteria) this;
}
public Criteria andCreateByIsNotNull() {
addCriterion("create_by is not null");
return (Criteria) this;
}
public Criteria andCreateByEqualTo(String value) {
addCriterion("create_by =", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotEqualTo(String value) {
addCriterion("create_by <>", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByGreaterThan(String value) {
addCriterion("create_by >", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByGreaterThanOrEqualTo(String value) {
addCriterion("create_by >=", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByLessThan(String value) {
addCriterion("create_by <", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByLessThanOrEqualTo(String value) {
addCriterion("create_by <=", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByLike(String value) {
addCriterion("create_by like", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotLike(String value) {
addCriterion("create_by not like", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByIn(List<String> values) {
addCriterion("create_by in", values, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotIn(List<String> values) {
addCriterion("create_by not in", values, "createBy");
return (Criteria) this;
}
public Criteria andCreateByBetween(String value1, String value2) {
addCriterion("create_by between", value1, value2, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotBetween(String value1, String value2) {
addCriterion("create_by not between", value1, value2, "createBy");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateByIsNull() {
addCriterion("update_by is null");
return (Criteria) this;
}
public Criteria andUpdateByIsNotNull() {
addCriterion("update_by is not null");
return (Criteria) this;
}
public Criteria andUpdateByEqualTo(String value) {
addCriterion("update_by =", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByNotEqualTo(String value) {
addCriterion("update_by <>", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByGreaterThan(String value) {
addCriterion("update_by >", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
addCriterion("update_by >=", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByLessThan(String value) {
addCriterion("update_by <", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByLessThanOrEqualTo(String value) {
addCriterion("update_by <=", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByLike(String value) {
addCriterion("update_by like", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByNotLike(String value) {
addCriterion("update_by not like", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByIn(List<String> values) {
addCriterion("update_by in", values, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByNotIn(List<String> values) {
addCriterion("update_by not in", values, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByBetween(String value1, String value2) {
addCriterion("update_by between", value1, value2, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByNotBetween(String value1, String value2) {
addCriterion("update_by not between", value1, value2, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andRemarkIsNull() {
addCriterion("remark is null");
return (Criteria) this;
}
public Criteria andRemarkIsNotNull() {
addCriterion("remark is not null");
return (Criteria) this;
}
public Criteria andRemarkEqualTo(String value) {
addCriterion("remark =", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotEqualTo(String value) {
addCriterion("remark <>", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkGreaterThan(String value) {
addCriterion("remark >", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkGreaterThanOrEqualTo(String value) {
addCriterion("remark >=", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLessThan(String value) {
addCriterion("remark <", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLessThanOrEqualTo(String value) {
addCriterion("remark <=", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLike(String value) {
addCriterion("remark like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotLike(String value) {
addCriterion("remark not like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkIn(List<String> values) {
addCriterion("remark in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotIn(List<String> values) {
addCriterion("remark not in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkBetween(String value1, String value2) {
addCriterion("remark between", value1, value2, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotBetween(String value1, String value2) {
addCriterion("remark not between", value1, value2, "remark");
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);
}
}
}

12
acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/DmsLoginUserVo.java

@ -19,9 +19,7 @@ public class DmsLoginUserVo {
@Data
public static class DmsUserVo {
private Integer id;
private Long tenantId;
private String userName;
private String password;
@ -35,6 +33,8 @@ public class DmsLoginUserVo {
private String sex;
private String status;
private String updateBy;
private String remark;
}
@Data
@ -49,6 +49,10 @@ public class DmsLoginUserVo {
@ApiModelProperty("")
private String dmsUserNickName;
@ApiModelProperty("")
private String username;
@ApiModelProperty("")
private String password;
@ApiModelProperty("")
private Long scoreId;
@ApiModelProperty("")
private String dataSourceKey;
@ -57,9 +61,9 @@ public class DmsLoginUserVo {
@ApiModelProperty("")
private String url;
@ApiModelProperty("")
private String username;
private String sUsername;
@ApiModelProperty("")
private String password;
private String sPassword;
@ApiModelProperty("")
private String createBy;
@ApiModelProperty("")

49
acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/RmsReportVo.java

@ -0,0 +1,49 @@
package com.acupuncture.system.domain.vo;
import com.acupuncture.system.domain.po.RmsReportManagement;
import com.acupuncture.system.domain.po.RmsReportType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author zzc
* @Package com.acupuncture.system.domain.vo
* @Date 2025/2/10 15:59
* @description:
*/
public class RmsReportVo {
@Data
public static class TypeResult{
@ApiModelProperty("")
private Integer id;
@ApiModelProperty("类型名")
private String typeName;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建时间")
private Date createTime;
}
@Data
public static class ManagementResult{
private Long id;
@ApiModelProperty("上报标题")
private String reportTitle;
@ApiModelProperty("上报类型Id")
private Long reportType;
@ApiModelProperty("时间范围开始")
private Date timeRangeStart;
@ApiModelProperty("时间范围结束")
private Date timeRangeEnd;
@ApiModelProperty("上报状态")
private Byte status;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建时间")
private Date createTime;
}
}

8
acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/DmsUserDao.java

@ -1,6 +1,7 @@
package com.acupuncture.system.persist.dao;
import com.acupuncture.common.annotation.DataSource;
import com.acupuncture.common.core.domain.entity.SysUser;
import com.acupuncture.common.enums.DataSourceType;
import com.acupuncture.system.domain.vo.DmsLoginUserVo;
import org.apache.ibatis.annotations.Param;
@ -30,4 +31,11 @@ public interface DmsUserDao {
@DataSource(DataSourceType.MASTER)
DmsLoginUserVo.DataScoreVo queryLoginUserDataScore(@Param("userName") String userName);
/**
* 修改用户信息
*
* @param user 用户信息
* @return 结果
*/
public int updateUser(DmsLoginUserVo.DmsUserVo user);
}

28
acupuncture-system/src/main/java/com/acupuncture/system/persist/mapper/RmsReportManagementMapper.java

@ -0,0 +1,28 @@
package com.acupuncture.system.persist.mapper;
import com.acupuncture.system.domain.po.RmsReportManagement;
import com.acupuncture.system.domain.po.RmsReportManagementExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface RmsReportManagementMapper {
long countByExample(RmsReportManagementExample example);
int deleteByPrimaryKey(Long id);
int insert(RmsReportManagement record);
int insertSelective(RmsReportManagement record);
List<RmsReportManagement> selectByExample(RmsReportManagementExample example);
RmsReportManagement selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") RmsReportManagement record, @Param("example") RmsReportManagementExample example);
int updateByExample(@Param("record") RmsReportManagement record, @Param("example") RmsReportManagementExample example);
int updateByPrimaryKeySelective(RmsReportManagement record);
int updateByPrimaryKey(RmsReportManagement record);
}

8
acupuncture-system/src/main/java/com/acupuncture/system/service/DmsLoginService.java

@ -19,4 +19,12 @@ public interface DmsLoginService {
* @return 用户对象信息
*/
public DmsLoginUserVo.DataScoreVo selectUserByUserName(String userName);
/**
* 重置用户密码
*
* @param user 用户信息
* @return 结果
*/
public int resetPwd(DmsLoginUserVo.DmsUserVo user);
}

24
acupuncture-system/src/main/java/com/acupuncture/system/service/RmsReportService.java

@ -0,0 +1,24 @@
package com.acupuncture.system.service;
import com.acupuncture.common.core.domain.R;
import com.acupuncture.system.domain.vo.RmsReportVo;
import java.util.List;
/**
* @Author zzc
* @Package com.acupuncture.system.service
* @Date 2025/2/10 15:59
* @description:
*/
public interface RmsReportService {
/**
* 查询所有类型
* @return
*/
List<RmsReportVo.TypeResult> queryTypeList(String typeName);
List<RmsReportVo.ManagementResult> queryManagementList(Long typeId);
}

5
acupuncture-system/src/main/java/com/acupuncture/system/service/impl/DmsLoginServiceImpl.java

@ -24,4 +24,9 @@ public class DmsLoginServiceImpl implements DmsLoginService {
public DmsLoginUserVo.DataScoreVo selectUserByUserName(String userName) {
return dmsUserDao.queryLoginUserDataScore(userName);
}
@Override
public int resetPwd(DmsLoginUserVo.DmsUserVo user) {
return dmsUserDao.updateUser(user);
}
}

24
acupuncture-system/src/main/java/com/acupuncture/system/service/impl/RmsReportServiceImpl.java

@ -0,0 +1,24 @@
package com.acupuncture.system.service.impl;
import com.acupuncture.system.domain.vo.RmsReportVo;
import com.acupuncture.system.service.RmsReportService;
import java.util.List;
/**
* @Author zzc
* @Package com.acupuncture.system.service.impl
* @Date 2025/2/10 15:59
* @description:
*/
public class RmsReportServiceImpl implements RmsReportService {
@Override
public List<RmsReportVo.TypeResult> queryTypeList(String typeName) {
return null;
}
@Override
public List<RmsReportVo.ManagementResult> queryManagementList(Long typeId) {
return null;
}
}

24
acupuncture-system/src/main/resources/mapper/dao/SysPowerDao.xml

@ -22,14 +22,15 @@
<select id="queryLoginUserDataScore" resultType="com.acupuncture.system.domain.vo.DmsLoginUserVo$DataScoreVo">
select
d.id as dmsUserId,
d.user_name as dmsUsername,
d.nick_name as dmsUserNickName,
d.user_name,
d.password,
s.id as scoreId,
s.data_source_key as dataSourceKey,
s.hospital_id as hospitalId,
s.url,
s.username,
s.password,
s.username as sUsername,
s.password as sPassword,
t.id as tenantId,
d.del_flag as delFlag
from
@ -50,4 +51,21 @@
and t.del_flag = 0
</where>
</select>
<update id="updateUser" parameterType="com.acupuncture.system.domain.vo.DmsLoginUserVo$DmsUserVo">
update dms_user
<set>
<if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
<if test="email != null ">email = #{email},</if>
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
<if test="sex != null and sex != ''">sex = #{sex},</if>
<if test="password != null and password != ''">password = #{password},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
update_time = sysdate()
</set>
where id = #{id}
</update>
</mapper>

317
acupuncture-system/src/main/resources/mapper/system/RmsReportManagementMapper.xml

@ -0,0 +1,317 @@
<?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.acupuncture.system.persist.mapper.RmsReportManagementMapper">
<resultMap id="BaseResultMap" type="com.acupuncture.system.domain.po.RmsReportManagement">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="report_title" jdbcType="VARCHAR" property="reportTitle" />
<result column="report_type" jdbcType="BIGINT" property="reportType" />
<result column="time_range_start" jdbcType="DATE" property="timeRangeStart" />
<result column="time_range_end" jdbcType="DATE" property="timeRangeEnd" />
<result column="status" jdbcType="TINYINT" property="status" />
<result column="del_flag" jdbcType="TINYINT" property="delFlag" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
</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, report_title, report_type, time_range_start, time_range_end, status, del_flag,
create_by, create_time, update_by, update_time, remark
</sql>
<select id="selectByExample" parameterType="com.acupuncture.system.domain.po.RmsReportManagementExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from rms_report_management
<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 rms_report_management
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from rms_report_management
where id = #{id,jdbcType=BIGINT}
</delete>
<insert id="insert" parameterType="com.acupuncture.system.domain.po.RmsReportManagement">
insert into rms_report_management (id, report_title, report_type,
time_range_start, time_range_end, status,
del_flag, create_by, create_time,
update_by, update_time, remark
)
values (#{id,jdbcType=BIGINT}, #{reportTitle,jdbcType=VARCHAR}, #{reportType,jdbcType=BIGINT},
#{timeRangeStart,jdbcType=DATE}, #{timeRangeEnd,jdbcType=DATE}, #{status,jdbcType=TINYINT},
#{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.acupuncture.system.domain.po.RmsReportManagement">
insert into rms_report_management
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="reportTitle != null">
report_title,
</if>
<if test="reportType != null">
report_type,
</if>
<if test="timeRangeStart != null">
time_range_start,
</if>
<if test="timeRangeEnd != null">
time_range_end,
</if>
<if test="status != null">
status,
</if>
<if test="delFlag != null">
del_flag,
</if>
<if test="createBy != null">
create_by,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateBy != null">
update_by,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="remark != null">
remark,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="reportTitle != null">
#{reportTitle,jdbcType=VARCHAR},
</if>
<if test="reportType != null">
#{reportType,jdbcType=BIGINT},
</if>
<if test="timeRangeStart != null">
#{timeRangeStart,jdbcType=DATE},
</if>
<if test="timeRangeEnd != null">
#{timeRangeEnd,jdbcType=DATE},
</if>
<if test="status != null">
#{status,jdbcType=TINYINT},
</if>
<if test="delFlag != null">
#{delFlag,jdbcType=TINYINT},
</if>
<if test="createBy != null">
#{createBy,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateBy != null">
#{updateBy,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.acupuncture.system.domain.po.RmsReportManagementExample" resultType="java.lang.Long">
select count(*) from rms_report_management
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update rms_report_management
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.reportTitle != null">
report_title = #{record.reportTitle,jdbcType=VARCHAR},
</if>
<if test="record.reportType != null">
report_type = #{record.reportType,jdbcType=BIGINT},
</if>
<if test="record.timeRangeStart != null">
time_range_start = #{record.timeRangeStart,jdbcType=DATE},
</if>
<if test="record.timeRangeEnd != null">
time_range_end = #{record.timeRangeEnd,jdbcType=DATE},
</if>
<if test="record.status != null">
status = #{record.status,jdbcType=TINYINT},
</if>
<if test="record.delFlag != null">
del_flag = #{record.delFlag,jdbcType=TINYINT},
</if>
<if test="record.createBy != null">
create_by = #{record.createBy,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateBy != null">
update_by = #{record.updateBy,jdbcType=VARCHAR},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update rms_report_management
set id = #{record.id,jdbcType=BIGINT},
report_title = #{record.reportTitle,jdbcType=VARCHAR},
report_type = #{record.reportType,jdbcType=BIGINT},
time_range_start = #{record.timeRangeStart,jdbcType=DATE},
time_range_end = #{record.timeRangeEnd,jdbcType=DATE},
status = #{record.status,jdbcType=TINYINT},
del_flag = #{record.delFlag,jdbcType=TINYINT},
create_by = #{record.createBy,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_by = #{record.updateBy,jdbcType=VARCHAR},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
remark = #{record.remark,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.acupuncture.system.domain.po.RmsReportManagement">
update rms_report_management
<set>
<if test="reportTitle != null">
report_title = #{reportTitle,jdbcType=VARCHAR},
</if>
<if test="reportType != null">
report_type = #{reportType,jdbcType=BIGINT},
</if>
<if test="timeRangeStart != null">
time_range_start = #{timeRangeStart,jdbcType=DATE},
</if>
<if test="timeRangeEnd != null">
time_range_end = #{timeRangeEnd,jdbcType=DATE},
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
</if>
<if test="delFlag != null">
del_flag = #{delFlag,jdbcType=TINYINT},
</if>
<if test="createBy != null">
create_by = #{createBy,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateBy != null">
update_by = #{updateBy,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.acupuncture.system.domain.po.RmsReportManagement">
update rms_report_management
set report_title = #{reportTitle,jdbcType=VARCHAR},
report_type = #{reportType,jdbcType=BIGINT},
time_range_start = #{timeRangeStart,jdbcType=DATE},
time_range_end = #{timeRangeEnd,jdbcType=DATE},
status = #{status,jdbcType=TINYINT},
del_flag = #{delFlag,jdbcType=TINYINT},
create_by = #{createBy,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_by = #{updateBy,jdbcType=VARCHAR},
update_time = #{updateTime,jdbcType=TIMESTAMP},
remark = #{remark,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
Loading…
Cancel
Save