删除无用代码

gis_admin/src/main/java/com/gis/admin/entity/dto/UserDto.java

@@ -53,8 +53,11 @@ public class UserDto {
     @ApiModelProperty(value = "缩略图url")
     private String thumb;
 
-    @ApiModelProperty(value = "状态 0:启用(默认值)  1：禁用")
-    private Integer isDisable;
+//    @ApiModelProperty(value = "状态 0:启用(默认值)  1：禁用")
+//    private Integer isDisable;
+
+    @ApiModelProperty(value = "是否启动 0: 禁用  1：启用(默认值)")
+    private Integer isEnabled;
 
 
 //    @NotNull(message = "角色不能为空")

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -216,6 +216,7 @@ public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> im
         BeanUtils.copyProperties(param, entity);
 
         entity.setPassword(PasswordUtils.encrypt(param.getUserName(), param.getPassword(), PasswordUtils.getStaticSalt()));
+        // 默认启用
         entity.setIsEnabled(1);
         this.save(entity);
 

gis_cms/src/main/java/com/gis/cms/controller/SensitiveController.java

@@ -1,6 +1,7 @@
 package com.gis.cms.controller;
 
 import com.gis.cms.entity.dto.ContentDto;
+import com.gis.cms.entity.dto.SensitiveDto;
 import com.gis.common.base.aop.WebControllerLog;
 import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.util.Result;
@@ -36,7 +37,7 @@ public class SensitiveController  {
     @WebControllerLog(description = "知识管理-新增/修改", addDb = true)
     @ApiOperation("新增/修改")
     @PostMapping("save")
-    public Result save(@Valid @RequestBody ContentDto param) {
+    public Result save(@Valid @RequestBody SensitiveDto param) {
         return entityService.saveEntity(param);
     }
 

gis_cms/src/main/java/com/gis/cms/entity/dto/SensitiveDto.java

@@ -0,0 +1,20 @@
+package com.gis.cms.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Created by owen on 2021/8/10 0010 10:17
+ */
+@Data
+public class SensitiveDto {
+
+    @ApiModelProperty(value = "id")
+    private Long Id;
+
+    @NotBlank(message = "内容不能为空")
+    @ApiModelProperty(value = "内容", required = true)
+    private String name;
+}

gis_cms/src/main/java/com/gis/cms/service/SensitiveService.java

@@ -2,6 +2,7 @@ package com.gis.cms.service;
 
 
 import com.gis.cms.entity.dto.ContentDto;
+import com.gis.cms.entity.dto.SensitiveDto;
 import com.gis.cms.entity.po.SensitiveEntity;
 import com.gis.common.base.service.IBaseService;
 import com.gis.common.base.entity.dto.PageDto;
@@ -16,7 +17,7 @@ import java.util.Set;
 public interface SensitiveService extends IBaseService<SensitiveEntity, Long> {
 
 
-    Result saveEntity(ContentDto param);
+    Result saveEntity(SensitiveDto param);
 
     Result remove(Long id);
 

gis_cms/src/main/java/com/gis/cms/service/impl/BarrageServiceImpl.java

@@ -33,29 +33,6 @@ public class BarrageServiceImpl extends IBaseServiceImpl<BarrageEntity, Long> im
     }
 
 
-//    @Override
-//    public Result<PageInfo<BarrageEntity>> search(PageDateDto param, Integer display) {
-//        Condition condition = new Condition(BarrageEntity.class);
-//        String searchKey = param.getSearchKey();
-//        if (StringUtils.isNotBlank(searchKey)) {
-//            searchKey = StringUtils.trim(searchKey);
-//            // 多条件查询
-//            condition.and().orLike("nickName", "%" + searchKey + "%")
-//                    .orLike("content", "%" + searchKey + "%");
-//
-//        }
-//        String startTime = param.getStartTime();
-//        String endTime = param.getEndTime();
-//        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) ) {
-//            // 时间参数其中一个不传的话， 会导致between语句不执行(有时间的查询，还是建议拼接sql)
-//            condition.and().andBetween("createTime", startTime, endTime);
-//        }
-//
-//        condition.orderBy("createTime").desc();
-//        PageInfo<BarrageEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
-//        return Result.success(pageInfo);
-//    }
-
     @Override
     public Result<PageInfo<BarrageVo>> search(PageDateDto param, Integer display) {
         startPage(param);

gis_cms/src/main/java/com/gis/cms/service/impl/MournServiceImpl.java

@@ -36,30 +36,6 @@ public class MournServiceImpl extends IBaseServiceImpl<MournEntity, Long> implem
         return this.entityMapper;
     }
 
-//    @Override
-//    public Result<MournEntity> search(PageDateDto param, Integer display) {
-//        startPage(param);
-//        Condition condition = new Condition(MournEntity.class);
-//        String searchKey = param.getSearchKey();
-//        if (StringUtils.isNotBlank(searchKey)) {
-//            searchKey = StringUtils.trim(searchKey);
-//            condition.and().orLike("realName", "%" + searchKey + "%")
-//                    .orLike("unit", "%" + searchKey + "%");
-//        }
-//        String startTime = param.getStartTime();
-//        String endTime = param.getEndTime();
-//        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
-//            condition.and().andBetween("createTime", startTime, endTime);
-//        }
-//
-//        if (display != null) {
-//            condition.and().andEqualTo("display", display);
-//        }
-//
-//        condition.orderBy("createTime").desc();
-//        PageInfo<MournEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
-//        return Result.success(pageInfo);
-//    }
 
     @Override
     public Result<MournEntity> search(PageDateDto param, Integer display) {

gis_cms/src/main/java/com/gis/cms/service/impl/NewsServiceImpl.java

@@ -41,9 +41,6 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
     private NewsMapper entityMapper;
 
 
-    @Resource
-    public HttpServletRequest request;
-
     @Autowired
     FileService fileService;
 

gis_cms/src/main/java/com/gis/cms/service/impl/QuestionGroupServiceImpl.java

@@ -45,9 +45,6 @@ public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEnti
     private QuestionGroupMapper entityMapper;
 
 
-    @Resource
-    public HttpServletRequest request;
-
     @Autowired
     FileService fileService;
 

gis_cms/src/main/java/com/gis/cms/service/impl/QuestionUserServiceImpl.java

@@ -30,9 +30,6 @@ public class QuestionUserServiceImpl extends IBaseServiceImpl<QuestionUserEntity
     QuestionAnswerService questionAnswerService;
 
 
-
-
-
     @Override
     public IBaseMapper<QuestionUserEntity, Long> getBaseMapper() {
         return this.entityMapper;

gis_cms/src/main/java/com/gis/cms/service/impl/SensitiveServiceImpl.java

@@ -1,6 +1,7 @@
 package com.gis.cms.service.impl;
 
 import com.gis.cms.entity.dto.ContentDto;
+import com.gis.cms.entity.dto.SensitiveDto;
 import com.gis.cms.entity.po.SensitiveEntity;
 import com.gis.cms.mapper.SensitiveMapper;
 import com.gis.common.base.entity.dto.PageDto;
@@ -61,7 +62,7 @@ public class SensitiveServiceImpl extends IBaseServiceImpl<SensitiveEntity, Long
 
 
     @Override
-    public Result saveEntity(ContentDto param) {
+    public Result saveEntity(SensitiveDto param) {
         Long id = param.getId();
         SensitiveEntity entity = null;
         if (id == null) {