@t2652009480 9 months ago
commit 81d5586ae8

@ -21,6 +21,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
@ -42,6 +43,19 @@ public class StuDigitalCreditController {
// return new ResultDataEntity<>(HttpStatus.OK,stuConceptNavigations);
// }
@GetMapping("/getKnowSummaryInfo")
@AnonymousAccess
@ApiOperation("知识概要查看")
public ResultEntity getKnowSummaryInfo(@ApiParam("模块(小模块)")@NotNull String module,
@ApiParam("归属(大模块)")@NotNull String ascription) {
return stuDigitalIndustrializationService.getKnowSummaryInfo(module,ascription);
}
@PostMapping("/getConceptHashResources")
@AnonymousAccess
@ApiOperation("学习资源查看")

@ -83,6 +83,15 @@ private StuRateService rateService;
}
@ApiOperation("增信措施回显")
@GetMapping("enhanceMeasureBySelect")
@AnonymousAccess
public ResultEntity enhanceMeasureBySelect(String userId,String module){
return rateService.enhanceMeasureBySelect(userId,module);
}
@ApiOperation("增信措施自动评分")
@PostMapping("enhanceMeasureByAutoRating")

@ -15,6 +15,7 @@ import com.sztzjy.digital_credit.util.ResultEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
@ -49,12 +50,34 @@ public class AdminBlockController {
StuKnowSummary stuKnowSummary = new StuKnowSummary();
stuKnowSummary.setContext(adminKnowSummaryDto.getContext());
stuKnowSummary.setCreateTime(new Date());
stuKnowSummary.setAscription(adminKnowSummaryDto.getAscription());
stuKnowSummary.setModule(adminKnowSummaryDto.getModule());
stuKnowSummary.setUploadAuthor(adminKnowSummaryDto.getUserId());
stuKnowSummaryMapper.insertSelective(stuKnowSummary);
StuKnowSummaryExample knowSummaryExample = new StuKnowSummaryExample();
knowSummaryExample.createCriteria().andAscriptionEqualTo(adminKnowSummaryDto.getAscription()).andModuleEqualTo(adminKnowSummaryDto.getModule());
List<StuKnowSummary> stuKnowSummaries = stuKnowSummaryMapper.selectByExample(knowSummaryExample);
if (stuKnowSummaries.isEmpty())
{
stuKnowSummaryMapper.insertSelective(stuKnowSummary);
return new ResultEntity<>(HttpStatus.OK,"新增成功!");
}else {
stuKnowSummaries.get(0).setContext(adminKnowSummaryDto.getContext());
stuKnowSummaries.get(0).setUpdateTime(new Date());
stuKnowSummaries.get(0).setAscription(adminKnowSummaryDto.getAscription());
stuKnowSummaries.get(0).setModule(adminKnowSummaryDto.getModule());
stuKnowSummaries.get(0).setUploadAuthor(adminKnowSummaryDto.getUserId());
stuKnowSummaryMapper.updateByPrimaryKeyWithBLOBs(stuKnowSummaries.get(0));
return new ResultEntity<>(HttpStatus.OK,"更新成功!");
}
return new ResultEntity<>(HttpStatus.OK,"新增成功!");
}

@ -42,8 +42,8 @@ public class AdminHashController {
@AnonymousAccess
@ApiOperation("学习资源新增")
public ResultEntity insertResources(@RequestParam(required = false) @RequestPart MultipartFile file,
@RequestParam(required = false)String module){
int result=adminHashService.insertResources(file,module);
@RequestParam(required = false)String module,String ascription){
int result=adminHashService.insertResources(file,module,ascription);
if (result>0){
return new ResultEntity<>(HttpStatus.OK,"新增成功");
}else {

@ -4,85 +4,86 @@ import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
/**
*
*
* @author tz
* stu_knowledge_summary
* @author whb
* stu_know_summary
*/
public class StuKnowledgeSummary {
@ApiModelProperty("概要ID")
private String summaryId;
@ApiModelProperty("id")
private Integer id;
@ApiModelProperty("目录ID")
private String directoryId;
@ApiModelProperty("归属模块")
private String module;
@ApiModelProperty("目录名称")
private String directoryName;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("父类目录ID")
private String parentId;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("概要内容")
private String summaryContent;
@ApiModelProperty("上传作者")
private String uploadAuthor;
@ApiModelProperty("属模块")
private String module;
@ApiModelProperty("属模块")
private String ascription;
@ApiModelProperty("阅读时间")
private Date readingTime;
@ApiModelProperty("文本内容")
private String context;
public String getSummaryId() {
return summaryId;
public Integer getId() {
return id;
}
public void setSummaryId(String summaryId) {
this.summaryId = summaryId == null ? null : summaryId.trim();
public void setId(Integer id) {
this.id = id;
}
public String getDirectoryId() {
return directoryId;
public String getModule() {
return module;
}
public void setDirectoryId(String directoryId) {
this.directoryId = directoryId == null ? null : directoryId.trim();
public void setModule(String module) {
this.module = module == null ? null : module.trim();
}
public String getDirectoryName() {
return directoryName;
public Date getCreateTime() {
return createTime;
}
public void setDirectoryName(String directoryName) {
this.directoryName = directoryName == null ? null : directoryName.trim();
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getParentId() {
return parentId;
public Date getUpdateTime() {
return updateTime;
}
public void setParentId(String parentId) {
this.parentId = parentId == null ? null : parentId.trim();
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getSummaryContent() {
return summaryContent;
public String getUploadAuthor() {
return uploadAuthor;
}
public void setSummaryContent(String summaryContent) {
this.summaryContent = summaryContent == null ? null : summaryContent.trim();
public void setUploadAuthor(String uploadAuthor) {
this.uploadAuthor = uploadAuthor == null ? null : uploadAuthor.trim();
}
public String getModule() {
return module;
public String getAscription() {
return ascription;
}
public void setModule(String module) {
this.module = module == null ? null : module.trim();
public void setAscription(String ascription) {
this.ascription = ascription == null ? null : ascription.trim();
}
public Date getReadingTime() {
return readingTime;
public String getContext() {
return context;
}
public void setReadingTime(Date readingTime) {
this.readingTime = readingTime;
public void setContext(String context) {
this.context = context == null ? null : context.trim();
}
}

@ -105,483 +105,393 @@ public class StuKnowledgeSummaryExample {
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andSummaryIdIsNull() {
addCriterion("summary_id is null");
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andSummaryIdIsNotNull() {
addCriterion("summary_id is not null");
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andSummaryIdEqualTo(String value) {
addCriterion("summary_id =", value, "summaryId");
public Criteria andIdEqualTo(Integer value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andSummaryIdNotEqualTo(String value) {
addCriterion("summary_id <>", value, "summaryId");
public Criteria andIdNotEqualTo(Integer value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andSummaryIdGreaterThan(String value) {
addCriterion("summary_id >", value, "summaryId");
public Criteria andIdGreaterThan(Integer value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andSummaryIdGreaterThanOrEqualTo(String value) {
addCriterion("summary_id >=", value, "summaryId");
public Criteria andIdGreaterThanOrEqualTo(Integer value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andSummaryIdLessThan(String value) {
addCriterion("summary_id <", value, "summaryId");
public Criteria andIdLessThan(Integer value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andSummaryIdLessThanOrEqualTo(String value) {
addCriterion("summary_id <=", value, "summaryId");
public Criteria andIdLessThanOrEqualTo(Integer value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andSummaryIdLike(String value) {
addCriterion("summary_id like", value, "summaryId");
public Criteria andIdIn(List<Integer> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andSummaryIdNotLike(String value) {
addCriterion("summary_id not like", value, "summaryId");
public Criteria andIdNotIn(List<Integer> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andSummaryIdIn(List<String> values) {
addCriterion("summary_id in", values, "summaryId");
public Criteria andIdBetween(Integer value1, Integer value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andSummaryIdNotIn(List<String> values) {
addCriterion("summary_id not in", values, "summaryId");
public Criteria andIdNotBetween(Integer value1, Integer value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andSummaryIdBetween(String value1, String value2) {
addCriterion("summary_id between", value1, value2, "summaryId");
return (Criteria) this;
}
public Criteria andSummaryIdNotBetween(String value1, String value2) {
addCriterion("summary_id not between", value1, value2, "summaryId");
return (Criteria) this;
}
public Criteria andDirectoryIdIsNull() {
addCriterion("directory_id is null");
return (Criteria) this;
}
public Criteria andDirectoryIdIsNotNull() {
addCriterion("directory_id is not null");
return (Criteria) this;
}
public Criteria andDirectoryIdEqualTo(String value) {
addCriterion("directory_id =", value, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdNotEqualTo(String value) {
addCriterion("directory_id <>", value, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdGreaterThan(String value) {
addCriterion("directory_id >", value, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdGreaterThanOrEqualTo(String value) {
addCriterion("directory_id >=", value, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdLessThan(String value) {
addCriterion("directory_id <", value, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdLessThanOrEqualTo(String value) {
addCriterion("directory_id <=", value, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdLike(String value) {
addCriterion("directory_id like", value, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdNotLike(String value) {
addCriterion("directory_id not like", value, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdIn(List<String> values) {
addCriterion("directory_id in", values, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdNotIn(List<String> values) {
addCriterion("directory_id not in", values, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdBetween(String value1, String value2) {
addCriterion("directory_id between", value1, value2, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryIdNotBetween(String value1, String value2) {
addCriterion("directory_id not between", value1, value2, "directoryId");
return (Criteria) this;
}
public Criteria andDirectoryNameIsNull() {
addCriterion("directory_name is null");
return (Criteria) this;
}
public Criteria andDirectoryNameIsNotNull() {
addCriterion("directory_name is not null");
return (Criteria) this;
}
public Criteria andDirectoryNameEqualTo(String value) {
addCriterion("directory_name =", value, "directoryName");
public Criteria andModuleIsNull() {
addCriterion("module is null");
return (Criteria) this;
}
public Criteria andDirectoryNameNotEqualTo(String value) {
addCriterion("directory_name <>", value, "directoryName");
public Criteria andModuleIsNotNull() {
addCriterion("module is not null");
return (Criteria) this;
}
public Criteria andDirectoryNameGreaterThan(String value) {
addCriterion("directory_name >", value, "directoryName");
public Criteria andModuleEqualTo(String value) {
addCriterion("module =", value, "module");
return (Criteria) this;
}
public Criteria andDirectoryNameGreaterThanOrEqualTo(String value) {
addCriterion("directory_name >=", value, "directoryName");
public Criteria andModuleNotEqualTo(String value) {
addCriterion("module <>", value, "module");
return (Criteria) this;
}
public Criteria andDirectoryNameLessThan(String value) {
addCriterion("directory_name <", value, "directoryName");
public Criteria andModuleGreaterThan(String value) {
addCriterion("module >", value, "module");
return (Criteria) this;
}
public Criteria andDirectoryNameLessThanOrEqualTo(String value) {
addCriterion("directory_name <=", value, "directoryName");
public Criteria andModuleGreaterThanOrEqualTo(String value) {
addCriterion("module >=", value, "module");
return (Criteria) this;
}
public Criteria andDirectoryNameLike(String value) {
addCriterion("directory_name like", value, "directoryName");
public Criteria andModuleLessThan(String value) {
addCriterion("module <", value, "module");
return (Criteria) this;
}
public Criteria andDirectoryNameNotLike(String value) {
addCriterion("directory_name not like", value, "directoryName");
public Criteria andModuleLessThanOrEqualTo(String value) {
addCriterion("module <=", value, "module");
return (Criteria) this;
}
public Criteria andDirectoryNameIn(List<String> values) {
addCriterion("directory_name in", values, "directoryName");
public Criteria andModuleLike(String value) {
addCriterion("module like", value, "module");
return (Criteria) this;
}
public Criteria andDirectoryNameNotIn(List<String> values) {
addCriterion("directory_name not in", values, "directoryName");
public Criteria andModuleNotLike(String value) {
addCriterion("module not like", value, "module");
return (Criteria) this;
}
public Criteria andDirectoryNameBetween(String value1, String value2) {
addCriterion("directory_name between", value1, value2, "directoryName");
public Criteria andModuleIn(List<String> values) {
addCriterion("module in", values, "module");
return (Criteria) this;
}
public Criteria andDirectoryNameNotBetween(String value1, String value2) {
addCriterion("directory_name not between", value1, value2, "directoryName");
public Criteria andModuleNotIn(List<String> values) {
addCriterion("module not in", values, "module");
return (Criteria) this;
}
public Criteria andParentIdIsNull() {
addCriterion("parent_id is null");
public Criteria andModuleBetween(String value1, String value2) {
addCriterion("module between", value1, value2, "module");
return (Criteria) this;
}
public Criteria andParentIdIsNotNull() {
addCriterion("parent_id is not null");
public Criteria andModuleNotBetween(String value1, String value2) {
addCriterion("module not between", value1, value2, "module");
return (Criteria) this;
}
public Criteria andParentIdEqualTo(String value) {
addCriterion("parent_id =", value, "parentId");
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andParentIdNotEqualTo(String value) {
addCriterion("parent_id <>", value, "parentId");
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andParentIdGreaterThan(String value) {
addCriterion("parent_id >", value, "parentId");
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andParentIdGreaterThanOrEqualTo(String value) {
addCriterion("parent_id >=", value, "parentId");
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andParentIdLessThan(String value) {
addCriterion("parent_id <", value, "parentId");
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andParentIdLessThanOrEqualTo(String value) {
addCriterion("parent_id <=", value, "parentId");
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andParentIdLike(String value) {
addCriterion("parent_id like", value, "parentId");
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andParentIdNotLike(String value) {
addCriterion("parent_id not like", value, "parentId");
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andParentIdIn(List<String> values) {
addCriterion("parent_id in", values, "parentId");
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andParentIdNotIn(List<String> values) {
addCriterion("parent_id not in", values, "parentId");
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andParentIdBetween(String value1, String value2) {
addCriterion("parent_id between", value1, value2, "parentId");
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andParentIdNotBetween(String value1, String value2) {
addCriterion("parent_id not between", value1, value2, "parentId");
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andSummaryContentIsNull() {
addCriterion("summary_content is null");
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andSummaryContentIsNotNull() {
addCriterion("summary_content is not null");
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andSummaryContentEqualTo(String value) {
addCriterion("summary_content =", value, "summaryContent");
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andSummaryContentNotEqualTo(String value) {
addCriterion("summary_content <>", value, "summaryContent");
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andSummaryContentGreaterThan(String value) {
addCriterion("summary_content >", value, "summaryContent");
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andSummaryContentGreaterThanOrEqualTo(String value) {
addCriterion("summary_content >=", value, "summaryContent");
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andSummaryContentLessThan(String value) {
addCriterion("summary_content <", value, "summaryContent");
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andSummaryContentLessThanOrEqualTo(String value) {
addCriterion("summary_content <=", value, "summaryContent");
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andSummaryContentLike(String value) {
addCriterion("summary_content like", value, "summaryContent");
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andSummaryContentNotLike(String value) {
addCriterion("summary_content not like", value, "summaryContent");
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andSummaryContentIn(List<String> values) {
addCriterion("summary_content in", values, "summaryContent");
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andSummaryContentNotIn(List<String> values) {
addCriterion("summary_content not in", values, "summaryContent");
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andSummaryContentBetween(String value1, String value2) {
addCriterion("summary_content between", value1, value2, "summaryContent");
public Criteria andUploadAuthorIsNull() {
addCriterion("upload_author is null");
return (Criteria) this;
}
public Criteria andSummaryContentNotBetween(String value1, String value2) {
addCriterion("summary_content not between", value1, value2, "summaryContent");
public Criteria andUploadAuthorIsNotNull() {
addCriterion("upload_author is not null");
return (Criteria) this;
}
public Criteria andModuleIsNull() {
addCriterion("module is null");
public Criteria andUploadAuthorEqualTo(String value) {
addCriterion("upload_author =", value, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleIsNotNull() {
addCriterion("module is not null");
public Criteria andUploadAuthorNotEqualTo(String value) {
addCriterion("upload_author <>", value, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleEqualTo(String value) {
addCriterion("module =", value, "module");
public Criteria andUploadAuthorGreaterThan(String value) {
addCriterion("upload_author >", value, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleNotEqualTo(String value) {
addCriterion("module <>", value, "module");
public Criteria andUploadAuthorGreaterThanOrEqualTo(String value) {
addCriterion("upload_author >=", value, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleGreaterThan(String value) {
addCriterion("module >", value, "module");
public Criteria andUploadAuthorLessThan(String value) {
addCriterion("upload_author <", value, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleGreaterThanOrEqualTo(String value) {
addCriterion("module >=", value, "module");
public Criteria andUploadAuthorLessThanOrEqualTo(String value) {
addCriterion("upload_author <=", value, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleLessThan(String value) {
addCriterion("module <", value, "module");
public Criteria andUploadAuthorLike(String value) {
addCriterion("upload_author like", value, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleLessThanOrEqualTo(String value) {
addCriterion("module <=", value, "module");
public Criteria andUploadAuthorNotLike(String value) {
addCriterion("upload_author not like", value, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleLike(String value) {
addCriterion("module like", value, "module");
public Criteria andUploadAuthorIn(List<String> values) {
addCriterion("upload_author in", values, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleNotLike(String value) {
addCriterion("module not like", value, "module");
public Criteria andUploadAuthorNotIn(List<String> values) {
addCriterion("upload_author not in", values, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleIn(List<String> values) {
addCriterion("module in", values, "module");
public Criteria andUploadAuthorBetween(String value1, String value2) {
addCriterion("upload_author between", value1, value2, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleNotIn(List<String> values) {
addCriterion("module not in", values, "module");
public Criteria andUploadAuthorNotBetween(String value1, String value2) {
addCriterion("upload_author not between", value1, value2, "uploadAuthor");
return (Criteria) this;
}
public Criteria andModuleBetween(String value1, String value2) {
addCriterion("module between", value1, value2, "module");
public Criteria andAscriptionIsNull() {
addCriterion("ascription is null");
return (Criteria) this;
}
public Criteria andModuleNotBetween(String value1, String value2) {
addCriterion("module not between", value1, value2, "module");
public Criteria andAscriptionIsNotNull() {
addCriterion("ascription is not null");
return (Criteria) this;
}
public Criteria andReadingTimeIsNull() {
addCriterion("reading_time is null");
public Criteria andAscriptionEqualTo(String value) {
addCriterion("ascription =", value, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeIsNotNull() {
addCriterion("reading_time is not null");
public Criteria andAscriptionNotEqualTo(String value) {
addCriterion("ascription <>", value, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeEqualTo(Date value) {
addCriterion("reading_time =", value, "readingTime");
public Criteria andAscriptionGreaterThan(String value) {
addCriterion("ascription >", value, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeNotEqualTo(Date value) {
addCriterion("reading_time <>", value, "readingTime");
public Criteria andAscriptionGreaterThanOrEqualTo(String value) {
addCriterion("ascription >=", value, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeGreaterThan(Date value) {
addCriterion("reading_time >", value, "readingTime");
public Criteria andAscriptionLessThan(String value) {
addCriterion("ascription <", value, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeGreaterThanOrEqualTo(Date value) {
addCriterion("reading_time >=", value, "readingTime");
public Criteria andAscriptionLessThanOrEqualTo(String value) {
addCriterion("ascription <=", value, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeLessThan(Date value) {
addCriterion("reading_time <", value, "readingTime");
public Criteria andAscriptionLike(String value) {
addCriterion("ascription like", value, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeLessThanOrEqualTo(Date value) {
addCriterion("reading_time <=", value, "readingTime");
public Criteria andAscriptionNotLike(String value) {
addCriterion("ascription not like", value, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeIn(List<Date> values) {
addCriterion("reading_time in", values, "readingTime");
public Criteria andAscriptionIn(List<String> values) {
addCriterion("ascription in", values, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeNotIn(List<Date> values) {
addCriterion("reading_time not in", values, "readingTime");
public Criteria andAscriptionNotIn(List<String> values) {
addCriterion("ascription not in", values, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeBetween(Date value1, Date value2) {
addCriterion("reading_time between", value1, value2, "readingTime");
public Criteria andAscriptionBetween(String value1, String value2) {
addCriterion("ascription between", value1, value2, "ascription");
return (Criteria) this;
}
public Criteria andReadingTimeNotBetween(Date value1, Date value2) {
addCriterion("reading_time not between", value1, value2, "readingTime");
public Criteria andAscriptionNotBetween(String value1, String value2) {
addCriterion("ascription not between", value1, value2, "ascription");
return (Criteria) this;
}
}

@ -5,7 +5,7 @@ import java.math.BigDecimal;
import io.swagger.annotations.ApiModelProperty;
/**
*
* @author tz
* @author whb
* stu_learning_assessment
*/
public class StuLearningAssessment {

@ -17,8 +17,12 @@ public class Topic extends StuLearningAssessment {
// @ExcelProperty(index = 0)
@ExcelProperty(value = "模块")
@ExcelProperty(value = "模块(例如:个人征信)")
@ExcelValid(message = "【模块】不能有空数据!")
private String topicParentModule;
@ExcelProperty(value = "子模块(例如:影响因素分析)")
@ExcelValid(message = "【子模块】不能有空数据!")
private String topicModule;
// value 指定excel中某列的标题名称

@ -13,6 +13,7 @@ public class AdminKnowSummaryDto {
private String context;
private String userId;
private String ascription;
private String module;

@ -3,30 +3,34 @@ package com.sztzjy.digital_credit.mapper;
import com.sztzjy.digital_credit.entity.StuKnowledgeSummary;
import com.sztzjy.digital_credit.entity.StuKnowledgeSummaryExample;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface StuKnowledgeSummaryMapper {
long countByExample(StuKnowledgeSummaryExample example);
int deleteByExample(StuKnowledgeSummaryExample example);
int deleteByPrimaryKey(String summaryId);
int deleteByPrimaryKey(Integer id);
int insert(StuKnowledgeSummary record);
int insertSelective(StuKnowledgeSummary record);
List<StuKnowledgeSummary> selectByExampleWithBLOBs(StuKnowledgeSummaryExample example);
List<StuKnowledgeSummary> selectByExample(StuKnowledgeSummaryExample example);
StuKnowledgeSummary selectByPrimaryKey(String summaryId);
StuKnowledgeSummary selectByPrimaryKey(Integer id);
int updateByExampleSelective(@Param("record") StuKnowledgeSummary record, @Param("example") StuKnowledgeSummaryExample example);
int updateByExampleWithBLOBs(@Param("record") StuKnowledgeSummary record, @Param("example") StuKnowledgeSummaryExample example);
int updateByExample(@Param("record") StuKnowledgeSummary record, @Param("example") StuKnowledgeSummaryExample example);
int updateByPrimaryKeySelective(StuKnowledgeSummary record);
int updateByPrimaryKeyWithBLOBs(StuKnowledgeSummary record);
int updateByPrimaryKey(StuKnowledgeSummary record);
}

@ -6,9 +6,8 @@ import com.sztzjy.digital_credit.entity.StuLearningAssessmentExample;
import java.util.List;
import com.sztzjy.digital_credit.entity.Topic;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface StuLearningAssessmentMapper {
long countByExample(StuLearningAssessmentExample example);
@ -31,8 +30,6 @@ public interface StuLearningAssessmentMapper {
int updateByPrimaryKeySelective(StuLearningAssessment record);
int updateByPrimaryKey(StuLearningAssessment record);
void insertBatch(List<Topic> list);
int insertBatch1(AdminExcelErrorMessage record);
@ -43,6 +40,4 @@ public interface StuLearningAssessmentMapper {
Integer selectByNumberMax(@Param("module") String module);
void insertData(Topic topic);
}

@ -13,7 +13,7 @@ import java.util.List;
public interface AdminHashService {
PageInfo<StuResources> getResources(String module,Integer size,Integer index);
int insertResources(MultipartFile file,String module);
int insertResources(MultipartFile file,String module,String ascription);
StuResources getByIdResources(String id);

@ -10,6 +10,7 @@ import com.sztzjy.digital_credit.entity.StuScoreDetails;
import com.sztzjy.digital_credit.entity.dto.StuAssessmentQuestionDetailsDTO;
import com.sztzjy.digital_credit.entity.dto.StuLearningAssessmentScoreDTO;
import com.sztzjy.digital_credit.entity.dto.StuScoreDetailsDTO;
import com.sztzjy.digital_credit.util.ResultEntity;
import java.util.List;
@ -37,4 +38,13 @@ public interface StuDigitalCreditService {
List<StuScoreDetails> getAcademicRecord(String userId, String module,String ascription);
void reAnswer(String userId, String module);
/**
*
* @param module
* @param ascription
* @return
*/
ResultEntity getKnowSummaryInfo(String module, String ascription);
}

@ -82,4 +82,12 @@ public interface StuRateService {
void enterScoreWriteUserByUserId(Object obj,String module,String userId);
ResultEntity getCreditEnhancement(String userId, String module);
/**
*
* @param userId
* @return
*/
ResultEntity enhanceMeasureBySelect(String userId,String module);
}

@ -49,7 +49,7 @@ public class AdminHashServiceIml implements AdminHashService {
}
@Override
public int insertResources(MultipartFile file,String module) {
public int insertResources(MultipartFile file,String module,String ascription) {
String[] arr={"01.png","02.png","03.png","04.png",};
if(file.isEmpty()){
throw new RuntimeException("文件不能为空");
@ -62,7 +62,7 @@ public class AdminHashServiceIml implements AdminHashService {
StuResourcesExample example=new StuResourcesExample();
StuResourcesExample.Criteria criteria=example.createCriteria();
criteria.andModuleEqualTo(module)
.andResourcesNameEqualTo(file.getOriginalFilename());
.andResourcesNameEqualTo(file.getOriginalFilename()).andAscriptionEqualTo(ascription);
List<StuResources> stuResourcesList= stuResourcesMapper.selectByExample(example);
if(stuResourcesList.size()!=0){
throw new RuntimeException("文件已存在");
@ -78,6 +78,7 @@ public class AdminHashServiceIml implements AdminHashService {
int index=new Random().nextInt(arr.length);
stuResources1.setResourcesImg(arr[index]);
stuResources1.setModule(module);
stuResources1.setAscription(ascription);
stuResources1.setResourcesUrl(upload);
stuResources1.setCreateTime(new Date());
// stuResources1.setReadTime();

@ -10,12 +10,14 @@ import com.sztzjy.digital_credit.service.StuDigitalCreditService;
import com.sztzjy.digital_credit.service.StuScoreCenterService;
import com.sztzjy.digital_credit.util.BigDecimalUtils;
import com.sztzjy.digital_credit.util.ConvertUtil;
import com.sztzjy.digital_credit.util.ResultEntity;
import com.sztzjy.digital_credit.util.compute.ScoringUtil;
import com.sztzjy.digital_credit.util.encryption.ShaUtil;
import com.sztzjy.digital_credit.mapper.*;
import com.sztzjy.digital_credit.service.StuDigitalCreditService;
import com.sztzjy.digital_credit.util.compute.ScoringUtil;
import com.sztzjy.digital_credit.util.encryption.ShaUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
@ -75,6 +77,9 @@ public class StuDigitalCreditServiceImpl implements StuDigitalCreditService {
@Resource
StuScoreCenterService stuScoreCenterService;
/**
*
*
@ -602,6 +607,31 @@ public class StuDigitalCreditServiceImpl implements StuDigitalCreditService {
stuAssessmentQuestionDetailsMapper.deleteByExample(example);
}
/**
*
* @param module
* @param ascription
* @return
*/
@Override
public ResultEntity getKnowSummaryInfo(String module, String ascription) {
StuKnowledgeSummaryExample summaryExample = new StuKnowledgeSummaryExample();
summaryExample.createCriteria().andModuleEqualTo(module).andAscriptionEqualTo(ascription);
List<StuKnowledgeSummary> stuKnowledgeSummarieList = stuKnowledgeSummaryMapper.selectByExampleWithBLOBs(summaryExample);
if ( stuKnowledgeSummarieList.isEmpty())
{
return null;
}
else {
return new ResultEntity<>(HttpStatus.OK,stuKnowledgeSummarieList.get(0));
}
}
/**
*
* @param userId ID

@ -970,4 +970,25 @@ public class StuRateServiceImpl implements StuRateService {
}
return null;
}
/**
*
* @param userId
* @return
*/
@Override
public ResultEntity enhanceMeasureBySelect(String userId,String module)
{
StuCreditEnhanceMeasureExample enhanceMeasureExample = new StuCreditEnhanceMeasureExample();
enhanceMeasureExample.createCriteria().andUserIdEqualTo(userId).andModuleEqualTo(module);
List<StuCreditEnhanceMeasure> creditEnhanceMeasureList = creditEnhanceMeasureMapper.selectByExample(enhanceMeasureExample);
if (!creditEnhanceMeasureList.isEmpty()){
return new ResultEntity<>(HttpStatus.OK,creditEnhanceMeasureList.get(0));
}else {
return new ResultEntity<>(HttpStatus.OK);
}
}
}

@ -100,9 +100,11 @@ public class MyExcelListener implements ReadListener<Topic> {
String s = UUID.randomUUID().toString().replaceAll("-", "");
cachedDataList.get(i).setTopicId(s);
cachedDataList.get(i).setModule(cachedDataList.get(i).getTopicModule());
cachedDataList.get(i).setAscription(cachedDataList.get(i).getTopicParentModule());
cachedDataList.get(i).setLogic(1);
// cachedDataList.get(i).setTopicNumber(BigDecimal.valueOf(max+i));
mapper.insertData(cachedDataList.get(i));
mapper.insertSelective(cachedDataList.get(i));
}
//mapper.insertBatch(cachedDataList);
}

@ -77,7 +77,7 @@
<!-- <table tableName="stu_assessment_question_details" domainObjectName="StuAssessmentQuestionDetails" />-->
<!-- <table tableName="stu_machine_learning" domainObjectName="StuMachineLearning" />-->
<table tableName="tch_public_resource_weight" domainObjectName="TchPublicResourceWeight" />
<table tableName="stu_know_summary" domainObjectName="StuKnowledgeSummary" />
</context>

@ -0,0 +1,287 @@
<?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.sztzjy.digital_credit.mapper.StuKnowledgeSummaryMapper">
<resultMap id="BaseResultMap" type="com.sztzjy.digital_credit.entity.StuKnowledgeSummary">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="module" jdbcType="VARCHAR" property="module" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="upload_author" jdbcType="VARCHAR" property="uploadAuthor" />
<result column="ascription" jdbcType="VARCHAR" property="ascription" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.sztzjy.digital_credit.entity.StuKnowledgeSummary">
<result column="context" jdbcType="LONGVARCHAR" property="context" />
</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, module, create_time, update_time, upload_author, ascription
</sql>
<sql id="Blob_Column_List">
context
</sql>
<select id="selectByExampleWithBLOBs" parameterType="com.sztzjy.digital_credit.entity.StuKnowledgeSummaryExample" resultMap="ResultMapWithBLOBs">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
,
<include refid="Blob_Column_List" />
from stu_know_summary
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByExample" parameterType="com.sztzjy.digital_credit.entity.StuKnowledgeSummaryExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from stu_know_summary
<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.Integer" resultMap="ResultMapWithBLOBs">
select
<include refid="Base_Column_List" />
,
<include refid="Blob_Column_List" />
from stu_know_summary
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from stu_know_summary
where id = #{id,jdbcType=INTEGER}
</delete>
<delete id="deleteByExample" parameterType="com.sztzjy.digital_credit.entity.StuKnowledgeSummaryExample">
delete from stu_know_summary
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.sztzjy.digital_credit.entity.StuKnowledgeSummary">
insert into stu_know_summary (id, module, create_time,
update_time, upload_author, ascription,
context)
values (#{id,jdbcType=INTEGER}, #{module,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{uploadAuthor,jdbcType=VARCHAR}, #{ascription,jdbcType=VARCHAR},
#{context,jdbcType=LONGVARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.sztzjy.digital_credit.entity.StuKnowledgeSummary">
insert into stu_know_summary
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="module != null">
module,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="uploadAuthor != null">
upload_author,
</if>
<if test="ascription != null">
ascription,
</if>
<if test="context != null">
context,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="module != null">
#{module,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="uploadAuthor != null">
#{uploadAuthor,jdbcType=VARCHAR},
</if>
<if test="ascription != null">
#{ascription,jdbcType=VARCHAR},
</if>
<if test="context != null">
#{context,jdbcType=LONGVARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.sztzjy.digital_credit.entity.StuKnowledgeSummaryExample" resultType="java.lang.Long">
select count(*) from stu_know_summary
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update stu_know_summary
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=INTEGER},
</if>
<if test="record.module != null">
module = #{record.module,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.uploadAuthor != null">
upload_author = #{record.uploadAuthor,jdbcType=VARCHAR},
</if>
<if test="record.ascription != null">
ascription = #{record.ascription,jdbcType=VARCHAR},
</if>
<if test="record.context != null">
context = #{record.context,jdbcType=LONGVARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExampleWithBLOBs" parameterType="map">
update stu_know_summary
set id = #{record.id,jdbcType=INTEGER},
module = #{record.module,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
upload_author = #{record.uploadAuthor,jdbcType=VARCHAR},
ascription = #{record.ascription,jdbcType=VARCHAR},
context = #{record.context,jdbcType=LONGVARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update stu_know_summary
set id = #{record.id,jdbcType=INTEGER},
module = #{record.module,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
upload_author = #{record.uploadAuthor,jdbcType=VARCHAR},
ascription = #{record.ascription,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.sztzjy.digital_credit.entity.StuKnowledgeSummary">
update stu_know_summary
<set>
<if test="module != null">
module = #{module,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="uploadAuthor != null">
upload_author = #{uploadAuthor,jdbcType=VARCHAR},
</if>
<if test="ascription != null">
ascription = #{ascription,jdbcType=VARCHAR},
</if>
<if test="context != null">
context = #{context,jdbcType=LONGVARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.sztzjy.digital_credit.entity.StuKnowledgeSummary">
update stu_know_summary
set module = #{module,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
upload_author = #{uploadAuthor,jdbcType=VARCHAR},
ascription = #{ascription,jdbcType=VARCHAR},
context = #{context,jdbcType=LONGVARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.sztzjy.digital_credit.entity.StuKnowledgeSummary">
update stu_know_summary
set module = #{module,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
upload_author = #{uploadAuthor,jdbcType=VARCHAR},
ascription = #{ascription,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>

@ -480,7 +480,6 @@
<!-- 批量插入 -->
<insert id="insertBatch" parameterType="com.sztzjy.digital_credit.entity.Topic">
insert into stu_learning_assessment (
@ -629,6 +628,7 @@
<select id="selectByState" resultType="java.lang.Integer">
select submission_state from admin_excel_error_message where module = #{module} And userId = #{userId}
</select>
<select id="selectByNumberMax" resultType="java.lang.Integer">
select topic_number from stu_learning_assessment where module = #{module} order by topic_number desc limit 1
</select>
@ -762,12 +762,4 @@
</trim>
</insert>
</mapper>
Loading…
Cancel
Save