瀏覽代碼

fix: 修复bug

wuweihao 4 年之前
父節點
當前提交
f2961242f8
共有 27 個文件被更改,包括 261 次插入18 次删除
  1. 76 0
      gis_application/src/main/resources/application-sit.properties
  2. 11 0
      gis_application/src/main/resources/sh/shutdown.sh
  3. 13 0
      gis_application/src/main/resources/sh/startup.sh
  4. 7 0
      gis_cms/src/main/java/com/gis/cms/controller/BarrageController.java
  5. 8 0
      gis_cms/src/main/java/com/gis/cms/controller/CommentController.java
  6. 5 1
      gis_cms/src/main/java/com/gis/cms/controller/GoodsController.java
  7. 6 0
      gis_cms/src/main/java/com/gis/cms/controller/MartyrController.java
  8. 1 1
      gis_cms/src/main/java/com/gis/cms/controller/MournController.java
  9. 6 0
      gis_cms/src/main/java/com/gis/cms/controller/NewsController.java
  10. 14 8
      gis_cms/src/main/java/com/gis/cms/controller/QuestionGroupController.java
  11. 9 4
      gis_cms/src/main/java/com/gis/cms/entity/po/CommentEntity.java
  12. 4 3
      gis_cms/src/main/java/com/gis/cms/entity/po/MournEntity.java
  13. 4 0
      gis_cms/src/main/java/com/gis/cms/mapper/CommentMapper.java
  14. 1 0
      gis_cms/src/main/java/com/gis/cms/mapper/provider/CommentProvider.java
  15. 3 0
      gis_cms/src/main/java/com/gis/cms/service/BarrageService.java
  16. 2 0
      gis_cms/src/main/java/com/gis/cms/service/CommentService.java
  17. 2 0
      gis_cms/src/main/java/com/gis/cms/service/GoodsService.java
  18. 2 0
      gis_cms/src/main/java/com/gis/cms/service/MartyrService.java
  19. 2 0
      gis_cms/src/main/java/com/gis/cms/service/NewsService.java
  20. 2 0
      gis_cms/src/main/java/com/gis/cms/service/QuestionGroupService.java
  21. 10 0
      gis_cms/src/main/java/com/gis/cms/service/impl/BarrageServiceImpl.java
  22. 6 0
      gis_cms/src/main/java/com/gis/cms/service/impl/CommentServiceImpl.java
  23. 14 0
      gis_cms/src/main/java/com/gis/cms/service/impl/GoodsServiceImpl.java
  24. 16 0
      gis_cms/src/main/java/com/gis/cms/service/impl/MartyrServiceImpl.java
  25. 16 0
      gis_cms/src/main/java/com/gis/cms/service/impl/NewsServiceImpl.java
  26. 16 0
      gis_cms/src/main/java/com/gis/cms/service/impl/QuestionGroupServiceImpl.java
  27. 5 1
      remark.md

+ 76 - 0
gis_application/src/main/resources/application-sit.properties

@@ -0,0 +1,76 @@
+
+#DB
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.druid.username=root
+spring.datasource.druid.url=jdbc:mysql://8.135.106.227:3306/${project.en}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.password=4dkk2021testproject%
+
+
+# \u521D\u59CB\u8FDE\u63A5\u6570
+spring.datasource.druid.initial-size=5
+# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
+spring.datasource.druid.min-idle=10
+# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
+spring.datasource.druid.max-active=20
+# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
+spring.datasource.druid.max-wait=60000
+# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+spring.datasource.druid.min-evictable-idle-time-millis=30000
+# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+spring.datasource.druid.max-evictable-idle-time-millis=90000
+# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
+spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=false
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.web-stat-filter.enabled=true
+spring.datasource.druid.stat-view-servlet.enabled=true
+
+
+# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
+spring.redis.timeout=3000ms
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
+spring.redis.jedis.pool.max-idle=8
+#\u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F0\u3002
+spring.redis.jedis.pool.min-idle=0
+# \u5982\u679C\u8D4B\u503C\u4E3A-1\uFF0C\u5219\u8868\u793A\u4E0D\u9650\u5236\uFF1B\u5982\u679Cpool\u5DF2\u7ECF\u5206\u914D\u4E86maxActive\u4E2Ajedis\u5B9E\u4F8B\uFF0C\u5219\u6B64\u65F6pool\u7684\u72B6\u6001\u4E3Aexhausted(\u8017\u5C3D)\u3002
+spring.redis.jedis.pool.max-active=8
+# \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
+spring.redis.jedis.pool.max-wait=-1ms
+
+
+#log
+logging.file.path=D:/log/${project.en}_log
+logging.config=classpath:logback-spring.xml
+logging.level.com.gis=debug
+
+# file info
+server.file.path=D:\\data\\${project.en}_data
+
+# url info
+#server.url.prefix=/data/
+#spring.mvc.static-path-pattern=/${server.url.prefix}/**
+#
+spring.mvc.static-path-pattern=/**
+### \u5339\u914D\u8DEF\u5F84\uFF0C \u6CE8\u610Ffile\u540E\u9762\u7684/ \uFF0Cwindows:\\  , linxu:\u5168\u8DEF\u5F84, \u4E0D\u9700\u8981\u7279\u522B\u52A0\u659C\u6760
+spring.resources.static-locations=file:\\${server.file.path}
+
+# swagger2 \u8BBE\u7F6E\u5168\u5C40\u5B57\u4F53\u683C\u5F0F\u4E3Autf-8
+swagger.package=com.gis
+swagger.title=${project.sc}-sit
+swagger.description=${swagger.title}
+swagger.version=1.0
+
+
+
+
+
+

+ 11 - 0
gis_application/src/main/resources/sh/shutdown.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+RESOURCE_NAME=army_xinjiang.jar
+   Pid=`awk '{print $1}' tpid`
+
+if [ ${Pid} ]; then
+kill -9 $Pid
+echo 'Kill Process!'
+else
+echo 'Stop failed!'
+fi
+

+ 13 - 0
gis_application/src/main/resources/sh/startup.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+RESOURCE_NAME=army_xinjiang.jar
+rm -f tpid
+nohup java -jar ./$RESOURCE_NAME --spring.profiles.active=sit &
+echo $! > tpid
+echo Start Success!
+echo
+
+#tpid=`ps -ef|grep $RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'`
+
+
+
+

+ 7 - 0
gis_cms/src/main/java/com/gis/cms/controller/BarrageController.java

@@ -1,6 +1,7 @@
 package com.gis.cms.controller;
 
 import com.gis.cms.entity.po.BarrageEntity;
+import com.gis.cms.entity.po.CommentEntity;
 import com.gis.cms.entity.vo.BarrageVo;
 import com.gis.common.base.aop.WebControllerLog;
 import com.gis.common.base.entity.dto.PageDateDto;
@@ -65,4 +66,10 @@ public class BarrageController  {
     }
 
 
+    @ApiOperation("详情")
+    @GetMapping("detail/{id}")
+    public Result<BarrageEntity> detail(@PathVariable Long id) {
+        return entityService.detail(id);
+    }
+
 }

+ 8 - 0
gis_cms/src/main/java/com/gis/cms/controller/CommentController.java

@@ -1,6 +1,7 @@
 package com.gis.cms.controller;
 
 import com.gis.cms.entity.po.CommentEntity;
+import com.gis.cms.entity.po.QuestionGroupEntity;
 import com.gis.common.base.aop.WebControllerLog;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.util.Result;
@@ -68,4 +69,11 @@ public class CommentController  {
     }
 
 
+    @ApiOperation("详情")
+    @GetMapping("detail/{id}")
+    public Result<CommentEntity> detail(@PathVariable Long id) {
+        return entityService.detail(id);
+    }
+
+
 }

+ 5 - 1
gis_cms/src/main/java/com/gis/cms/controller/GoodsController.java

@@ -105,5 +105,9 @@ public class GoodsController  {
         return entityService.auditDetail(id);
     }
 
-
+    @ApiOperation(value = "是否显示", notes = "display, 0:不显示, 1:显示")
+    @GetMapping("display/{id}/{display}")
+    public Result updateDisplay(@PathVariable Long id, @PathVariable Integer display) {
+        return entityService.display(id, display);
+    }
 }

+ 6 - 0
gis_cms/src/main/java/com/gis/cms/controller/MartyrController.java

@@ -85,4 +85,10 @@ public class MartyrController  {
     public Result auditDetail(@PathVariable Long id) {
         return entityService.auditDetail(id);
     }
+
+    @ApiOperation(value = "是否显示", notes = "display, 0:不显示, 1:显示")
+    @GetMapping("display/{id}/{display}")
+    public Result updateDisplay(@PathVariable Long id, @PathVariable Integer display) {
+        return entityService.display(id, display);
+    }
 }

+ 1 - 1
gis_cms/src/main/java/com/gis/cms/controller/MournController.java

@@ -46,7 +46,7 @@ public class MournController {
     }
 
     @ApiOperation(value = "是否显示", notes = "display, 0:不显示, 1:显示")
-    @GetMapping("updateDisplay/{id}/{display}")
+    @GetMapping("display/{id}/{display}")
     public Result updateDisplay(@PathVariable Long id, @PathVariable Integer display) {
         return entityService.updateDisplay(id, display);
     }

+ 6 - 0
gis_cms/src/main/java/com/gis/cms/controller/NewsController.java

@@ -77,4 +77,10 @@ public class NewsController  {
     public Result auditDetail(@PathVariable Long id) {
         return entityService.auditDetail(id);
     }
+
+    @ApiOperation(value = "是否显示", notes = "display, 0:不显示, 1:显示")
+    @GetMapping("display/{id}/{display}")
+    public Result updateDisplay(@PathVariable Long id, @PathVariable Integer display) {
+        return entityService.updateDisplay(id, display);
+    }
 }

+ 14 - 8
gis_cms/src/main/java/com/gis/cms/controller/QuestionGroupController.java

@@ -87,19 +87,19 @@ public class QuestionGroupController  {
     }
 
 
-    @WebControllerLog(description = "题组管理-问题答案新增", addDb = true)
-    @ApiOperation(value = "问题答案-新增", notes = "数组,允许多个提交")
+    @WebControllerLog(description = "题组管理-问题答案新增/修改", addDb = true)
+    @ApiOperation(value = "问题答案-新增/修改", notes = "数组,允许多个提交")
     @PostMapping("questionAnswer/save")
     public Result saveQuestionAnswerEntity(@Valid @RequestBody List<QuestionAnswerDto> param) {
         return answerService.saveEntitys(param);
     }
 
-    @WebControllerLog(description = "题组管理-问题答案修改", addDb = true)
-    @ApiOperation(value = "问题答案-修改", notes = "单个实体提交")
-    @PostMapping("questionAnswer/update")
-    public Result saveQuestionAnswerUpdate(@Valid @RequestBody QuestionAnswerDto param) {
-        return answerService.updateEntity(param);
-    }
+//    @WebControllerLog(description = "题组管理-问题答案修改", addDb = true)
+//    @ApiOperation(value = "问题答案-修改", notes = "单个实体提交")
+//    @PostMapping("questionAnswer/update")
+//    public Result saveQuestionAnswerUpdate(@Valid @RequestBody QuestionAnswerDto param) {
+//        return answerService.updateEntity(param);
+//    }
 
     @WebControllerLog(description = "题组管理-问题答案删除", addDb = true)
     @ApiOperation("问题答案-删除")
@@ -107,4 +107,10 @@ public class QuestionGroupController  {
     public Result removeQuestionAnswerEntity(@PathVariable Long questionAnswerId) {
         return answerService.remove(questionAnswerId);
     }
+
+    @ApiOperation(value = "是否显示", notes = "display, 0:不显示, 1:显示")
+    @GetMapping("display/{id}/{display}")
+    public Result updateDisplay(@PathVariable Long id, @PathVariable Integer display) {
+        return entityService.updateDisplay(id, display);
+    }
 }

+ 9 - 4
gis_cms/src/main/java/com/gis/cms/entity/po/CommentEntity.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -19,14 +20,11 @@ public class CommentEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
-//    @ApiModelProperty(value = "真实姓名")
-//    private String realName;
+
 
     @ApiModelProperty(value = "昵称")
     private String nickName;
 
-//    @ApiModelProperty(value = "单位")
-//    private String unit;
 
     @ApiModelProperty(value = "留言")
     private String content;
@@ -37,6 +35,13 @@ public class CommentEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否显示,1:是, 0:否")
     private Integer display;
 
+    @Transient
+    @ApiModelProperty(value = "真实姓名")
+    private String realName;
+
+    @Transient
+    @ApiModelProperty(value = "单位")
+    private String unit;
 
 
 

+ 4 - 3
gis_cms/src/main/java/com/gis/cms/entity/po/MournEntity.java

@@ -3,10 +3,9 @@ package com.gis.cms.entity.po;
 import com.gis.common.base.entity.po.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.data.annotation.Transient;
 
-import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -14,7 +13,6 @@ import java.io.Serializable;
  * 悼念烈士表
  */
 @Data
-@Entity
 @Table(name = "tb_mourn")
 public class MournEntity extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 7167520531265687441L;
@@ -37,6 +35,9 @@ public class MournEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "浏览量")
     private Integer visit;
 
+    /***
+     * javax.persistence.Transient 使用这个注解才有效
+     */
     @Transient
     @ApiModelProperty(value = "烈士真实姓名")
     private String martyRealName;

+ 4 - 0
gis_cms/src/main/java/com/gis/cms/mapper/CommentMapper.java

@@ -25,4 +25,8 @@ public interface CommentMapper extends IBaseMapper<CommentEntity, Long> {
 
     @Select("select COUNT(id) from tb_comment where is_delete = 0 AND  DATE_FORMAT( create_time, '%Y%m%d' ) = DATE_FORMAT(#{date} , '%Y%m%d' ) ")
     Integer countFindByDate(LocalDate now);
+
+    @Select("select a.id, a.create_time, a.content, a.display, a.parent_id, b.unit, b.real_name, b.nick_name from tb_comment a left join sys_user b on b.id=a.user_id " +
+            "where a.is_delete = '0' and a.id=#{id}")
+    CommentEntity detailMapper(Long id);
 }

+ 1 - 0
gis_cms/src/main/java/com/gis/cms/mapper/provider/CommentProvider.java

@@ -44,4 +44,5 @@ public class CommentProvider {
 
 
 
+
 }

+ 3 - 0
gis_cms/src/main/java/com/gis/cms/service/BarrageService.java

@@ -3,6 +3,7 @@ package com.gis.cms.service;
 
 import com.gis.cms.entity.dto.CommentDto;
 import com.gis.cms.entity.po.BarrageEntity;
+import com.gis.cms.entity.po.CommentEntity;
 import com.gis.cms.entity.vo.BarrageVo;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.base.service.IBaseService;
@@ -21,4 +22,6 @@ public interface BarrageService extends IBaseService<BarrageEntity, Long> {
     Result remove(Long id);
 
     Result saveEntity(CommentDto param);
+
+    Result<BarrageEntity> detail(Long id);
 }

+ 2 - 0
gis_cms/src/main/java/com/gis/cms/service/CommentService.java

@@ -27,4 +27,6 @@ public interface CommentService extends IBaseService<CommentEntity, Long> {
     Result saveEntity(CommentDto param);
 
     Result<CommentVo> voListTree(PageDateDto param, Integer display);
+
+    Result<CommentEntity> detail(Long id);
 }

+ 2 - 0
gis_cms/src/main/java/com/gis/cms/service/GoodsService.java

@@ -37,4 +37,6 @@ public interface GoodsService extends IBaseService<GoodsEntity, Long> {
     Result audit(AuditDto param);
 
     Result auditDetail(Long id);
+
+    Result display(Long id, Integer display);
 }

+ 2 - 0
gis_cms/src/main/java/com/gis/cms/service/MartyrService.java

@@ -31,4 +31,6 @@ public interface MartyrService extends IBaseService<MartyrEntity, Long> {
     Result audit(AuditDto param);
 
     Result auditDetail(Long id);
+
+    Result display(Long id, Integer display);
 }

+ 2 - 0
gis_cms/src/main/java/com/gis/cms/service/NewsService.java

@@ -28,4 +28,6 @@ public interface NewsService extends IBaseService<NewsEntity, Long> {
     Result audit(AuditDto param);
 
     Result auditDetail(Long id);
+
+    Result updateDisplay(Long id, Integer display);
 }

+ 2 - 0
gis_cms/src/main/java/com/gis/cms/service/QuestionGroupService.java

@@ -28,4 +28,6 @@ public interface QuestionGroupService extends IBaseService<QuestionGroupEntity,
     Result audit(AuditDto param);
 
     Result auditDetail(Long id);
+
+    Result updateDisplay(Long id, Integer display);
 }

+ 10 - 0
gis_cms/src/main/java/com/gis/cms/service/impl/BarrageServiceImpl.java

@@ -2,6 +2,7 @@ package com.gis.cms.service.impl;
 
 import com.gis.cms.entity.dto.CommentDto;
 import com.gis.cms.entity.po.BarrageEntity;
+import com.gis.cms.entity.po.CommentEntity;
 import com.gis.cms.entity.vo.BarrageVo;
 import com.gis.cms.mapper.BarrageMapper;
 import com.gis.common.base.entity.dto.PageDateDto;
@@ -84,4 +85,13 @@ public class BarrageServiceImpl extends IBaseServiceImpl<BarrageEntity, Long> im
         return Result.success();
     }
 
+    @Override
+    public Result<BarrageEntity> detail(Long id) {
+        BarrageEntity entity = this.findById(id);
+        if (entity == null) {
+            return Result.failure("对象不存在");
+        }
+        return Result.success(entity);
+    }
+
 }

+ 6 - 0
gis_cms/src/main/java/com/gis/cms/service/impl/CommentServiceImpl.java

@@ -89,4 +89,10 @@ public class CommentServiceImpl extends IBaseServiceImpl<CommentEntity, Long> im
         PageInfo<CommentTree> page = new PageInfo<>(commentTrees);
         return Result.success(page);
     }
+
+    @Override
+    public Result<CommentEntity> detail(Long id) {
+        CommentEntity entity = entityMapper.detailMapper(id);
+        return Result.success(entity);
+    }
 }

+ 14 - 0
gis_cms/src/main/java/com/gis/cms/service/impl/GoodsServiceImpl.java

@@ -6,6 +6,7 @@ import com.gis.cms.entity.dto.AuditDto;
 import com.gis.cms.entity.dto.GoodsDto;
 import com.gis.cms.entity.dto.TypePageDateDto;
 import com.gis.cms.entity.po.AuditLogEntity;
+import com.gis.cms.entity.po.CommentEntity;
 import com.gis.cms.entity.po.FileEntity;
 import com.gis.cms.entity.po.GoodsEntity;
 import com.gis.cms.mapper.GoodsMapper;
@@ -242,6 +243,19 @@ public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implem
         return Result.success(list);
     }
 
+    @Override
+    public Result display(Long id, Integer display) {
+        GoodsEntity entity = this.findById(id);
+        if (entity == null) {
+            log.error("对象id不存在 : {}", id);
+            return Result.failure("对象id不存在");
+        }
+
+        entity.setDisplay(display);
+        this.update(entity);
+        return Result.success(entity);
+    }
+
     private void updateStatus(Long id, Integer status){
         GoodsEntity entity = this.findById(id);
         if (entity == null) {

+ 16 - 0
gis_cms/src/main/java/com/gis/cms/service/impl/MartyrServiceImpl.java

@@ -4,6 +4,7 @@ import com.gis.cms.entity.dto.AuditDto;
 import com.gis.cms.entity.dto.MartyrDto;
 import com.gis.cms.entity.dto.StatusPageDataDto;
 import com.gis.cms.entity.po.AuditLogEntity;
+import com.gis.cms.entity.po.GoodsEntity;
 import com.gis.cms.entity.po.MartyrEntity;
 import com.gis.cms.mapper.MartyrMapper;
 import com.gis.cms.service.AuditLogService;
@@ -16,6 +17,7 @@ import com.gis.common.util.Result;
 import com.gis.cms.service.FileService;
 import com.gis.cms.service.MartyrService;
 import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/3/11 0011 16:16
  */
+@Slf4j
 @Service
 public class MartyrServiceImpl extends IBaseServiceImpl<MartyrEntity, Long> implements MartyrService {
 
@@ -116,6 +119,19 @@ public class MartyrServiceImpl extends IBaseServiceImpl<MartyrEntity, Long> impl
         return Result.success(list);
     }
 
+    @Override
+    public Result display(Long id, Integer display) {
+        MartyrEntity entity = this.findById(id);
+        if (entity == null) {
+            log.error("对象id不存在 : {}", id);
+            return Result.failure("对象id不存在");
+        }
+
+        entity.setDisplay(display);
+        this.update(entity);
+        return Result.success(entity);
+    }
+
 
     private void updateStatus(Long id, Integer status){
         MartyrEntity entity = this.findById(id);

+ 16 - 0
gis_cms/src/main/java/com/gis/cms/service/impl/NewsServiceImpl.java

@@ -4,6 +4,7 @@ import com.gis.cms.entity.dto.AuditDto;
 import com.gis.cms.entity.dto.NewsDto;
 import com.gis.cms.entity.dto.NewsPageDataDto;
 import com.gis.cms.entity.po.AuditLogEntity;
+import com.gis.cms.entity.po.MartyrEntity;
 import com.gis.cms.entity.po.NewsEntity;
 import com.gis.cms.mapper.NewsMapper;
 import com.gis.cms.service.AuditLogService;
@@ -16,6 +17,7 @@ import com.gis.common.util.Result;
 import com.gis.cms.service.FileService;
 import com.gis.cms.service.NewsService;
 import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/3/11 0011 16:16
  */
+@Slf4j
 @Service
 public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implements NewsService {
 
@@ -123,6 +126,19 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
         return Result.success(list);
     }
 
+    @Override
+    public Result updateDisplay(Long id, Integer display) {
+        NewsEntity entity = this.findById(id);
+        if (entity == null) {
+            log.error("对象id不存在 : {}", id);
+            return Result.failure("对象id不存在");
+        }
+
+        entity.setDisplay(display);
+        this.update(entity);
+        return Result.success(entity);
+    }
+
 
     private void updateStatus(Long id, Integer status){
         NewsEntity entity = this.findById(id);

+ 16 - 0
gis_cms/src/main/java/com/gis/cms/service/impl/QuestionGroupServiceImpl.java

@@ -4,6 +4,7 @@ import com.gis.cms.entity.dto.AuditDto;
 import com.gis.cms.entity.dto.QuestionGroupDto;
 import com.gis.cms.entity.dto.StatusPageDataDto;
 import com.gis.cms.entity.po.AuditLogEntity;
+import com.gis.cms.entity.po.GoodsEntity;
 import com.gis.cms.entity.po.QuestionAnswerEntity;
 import com.gis.cms.entity.po.QuestionGroupEntity;
 import com.gis.cms.mapper.QuestionGroupMapper;
@@ -18,6 +19,7 @@ import com.gis.common.constant.TypeCode;
 import com.gis.common.util.Result;
 import com.gis.cms.service.FileService;
 import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,6 +37,7 @@ import java.util.stream.Collectors;
 /**
  * Created by owen on 2020/3/11 0011 16:16
  */
+@Slf4j
 @Service
 public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEntity, Long> implements QuestionGroupService {
 
@@ -140,6 +143,19 @@ public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEnti
         return Result.success(list);
     }
 
+    @Override
+    public Result updateDisplay(Long id, Integer display) {
+        QuestionGroupEntity entity = this.findById(id);
+        if (entity == null) {
+            log.error("对象id不存在 : {}", id);
+            return Result.failure("对象id不存在");
+        }
+
+        entity.setDisplay(display);
+        this.update(entity);
+        return Result.success(entity);
+    }
+
 
     private void updateStatus(Long id, Integer status){
         QuestionGroupEntity entity = this.findById(id);

+ 5 - 1
remark.md

@@ -1 +1,5 @@
-# 2021-07-07 rbac用户权限标准版
+# 2021-07-07 rbac用户权限标准版
+
+
+# sit 
+    本地服务器win servcie 服务器 192.168.0.245