更新密码加密处理

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

@@ -42,12 +42,12 @@ public class RegisterDto {
     private String address;
 
     @Length(min = 6,message = "长度不能小于6位")
-    @Length(max = 12, message = "长度不能大于12位")
+//    @Length(max = 12, message = "长度不能大于12位")
     @ApiModelProperty(value = "登录密码")
     private String password;
 
     @Length(min = 6,message = "长度不能小于6位")
-    @Length(max = 12, message = "长度不能大于12位")
+//    @Length(max = 12, message = "长度不能大于12位")
     @ApiModelProperty(value = "确认密码")
     private String verifyPassword;
 

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

@@ -43,7 +43,7 @@ public class UserDto {
     @ApiModelProperty(value = "地址")
     private String address;
 
-    @NotNull(message = "启用状态不能为空")
+//    @NotNull(message = "启用状态不能为空")
     @ApiModelProperty(value = "状态 1:启用  0：停用 ")
     private Integer status;
 

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

@@ -62,7 +62,8 @@ public class QuestionGroupController  {
     }
 
 
-    @WebControllerLog(description = "题组管理-提审", addDb = true)
+//    @WebControllerLog(description = "题组管理-提审", addDb = true)
+    @WebControllerLog(description = "题组管理-审核", addDb = true)
     @ApiOperation("题组管理-提审")
     @GetMapping("apply/{id}")
     public Result apply(@PathVariable Long id) {

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

@@ -141,6 +141,14 @@ public class WebController {
         return martyrService.detail(id);
     }
 
+    @WebControllerLog(description = "门户网站-拜祭访问量")
+    @ApiOperation("拜祭访问量")
+    @GetMapping("martyr/visit/{id}")
+    public Result martyrVisit(@PathVariable Long id){
+        martyrService.addVisit(id);
+        return Result.success();
+    }
+
     @WebControllerLog(description = "门户网站-悼念列表")
     @ApiOperation("门户网站-悼念列表")
     @PostMapping("mourn/list")
@@ -149,13 +157,13 @@ public class WebController {
     }
 
 
-    @WebControllerLog(description = "门户网站-拜祭访问量")
-    @ApiOperation("拜祭访问量")
-    @GetMapping("mourn/visit/{id}")
-    public Result mournVisit(@PathVariable Long id){
-        mournService.addVisit(id);
-        return Result.success();
-    }
+//    @WebControllerLog(description = "门户网站-拜祭访问量")
+//    @ApiOperation("拜祭访问量")
+//    @GetMapping("mourn/visit/{id}")
+//    public Result mournVisit(@PathVariable Long id){
+//        mournService.addVisit(id);
+//        return Result.success();
+//    }
 
     @WebControllerLog(description = "门户网站-悼念烈士留言")
     @ApiOperation("门户网站-悼念烈士留言")

gis_cms/src/main/java/com/gis/cms/mapper/MartyrMapper.java

@@ -4,10 +4,13 @@ package com.gis.cms.mapper;
 import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.MartyrEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Component;
 
 @Component
 @Mapper
 public interface MartyrMapper extends IBaseMapper<MartyrEntity, Long> {
 
+    @Update("update tb_martyr set visit = visit + 1 , update_time = NOW() where is_delete = 0  and id = #{id}")
+    void addVisit(Long id);
 }

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

@@ -33,4 +33,6 @@ public interface MartyrService extends IBaseService<MartyrEntity, Long> {
     Result auditDetail(Long id);
 
     Result display(Long id, Integer display);
+
+    void addVisit(Long id);
 }

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

@@ -132,6 +132,11 @@ public class MartyrServiceImpl extends IBaseServiceImpl<MartyrEntity, Long> impl
         return Result.success(entity);
     }
 
+    @Override
+    public void addVisit(Long id) {
+        entityMapper.addVisit(id);
+    }
+
 
     private void updateStatus(Long id, Integer status){
         MartyrEntity entity = this.findById(id);

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

@@ -148,6 +148,10 @@ public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEnti
             return Result.failure("对象id不存在");
         }
 
+        if (entity.getStatus() != 3 || display == 1) {
+            return Result.failure("只有审核通过的，才允许设置为显示状态");
+
+        }
         entity.setDisplay(display);
         this.update(entity);
         return Result.success(entity);