Merge remote-tracking branch 'origin/dev_0814' into dev_0814

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/CompleteDeptDTO.java

@@ -0,0 +1,51 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 完整机构信息
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/7 9:8
+ */
+@Data
+public class CompleteDeptDTO implements Serializable {
+
+    private static final long serialVersionUID = 8264059305193996215L;
+
+    /**
+     * 区
+     */
+    private String district;
+    /**
+     * 区ID
+     */
+    private Long districtId;
+    /**
+     * 街道
+     */
+    private String street;
+    /**
+     * 街道ID
+     */
+    private Long streetId;
+    /**
+     * 社区
+     */
+    private String community;
+    /**
+     * 社区ID
+     */
+    private Long communityId;
+    /**
+     * 网格
+     */
+    private String grid;
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -15,6 +15,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
 import com.elink.esua.epdc.service.SysDeptService;
@@ -35,14 +36,14 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("dept")
-@Api(tags="部门管理")
+@Api(tags = "部门管理")
 public class SysDeptController {
     @Autowired
     private SysDeptService sysDeptService;
 
     @GetMapping("list")
     @ApiOperation("列表")
-    public Result<List<SysDeptDTO>> list(){
+    public Result<List<SysDeptDTO>> list() {
         List<SysDeptDTO> list = sysDeptService.list(new HashMap<>(1));
 
         return new Result<List<SysDeptDTO>>().ok(list);
@@ -50,14 +51,14 @@ public class SysDeptController {
 
     @GetMapping("sublist/{pid}")
     @ApiOperation("子列表")
-    public Result<List<SysSimpleDeptDTO>> sublist(@PathVariable("pid") String pid){
+    public Result<List<SysSimpleDeptDTO>> sublist(@PathVariable("pid") String pid) {
         List<SysSimpleDeptDTO> list = sysDeptService.subList(pid);
         return new Result().ok(list);
     }
 
     @GetMapping("{id}")
     @ApiOperation("信息")
-    public Result<SysDeptDTO> get(@PathVariable("id") Long id){
+    public Result<SysDeptDTO> get(@PathVariable("id") Long id) {
         SysDeptDTO data = sysDeptService.get(id);
 
         return new Result<SysDeptDTO>().ok(data);
@@ -66,7 +67,7 @@ public class SysDeptController {
     @PostMapping
     @ApiOperation("保存")
     @LogOperation("Save Dept")
-    public Result save(@RequestBody SysDeptDTO dto){
+    public Result save(@RequestBody SysDeptDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
@@ -78,7 +79,7 @@ public class SysDeptController {
     @PutMapping
     @ApiOperation("修改")
     @LogOperation("Update Dept")
-    public Result update(@RequestBody SysDeptDTO dto){
+    public Result update(@RequestBody SysDeptDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
 
@@ -90,7 +91,7 @@ public class SysDeptController {
     @DeleteMapping("{id}")
     @ApiOperation("删除")
     @LogOperation("Delete Dept")
-    public Result delete(@PathVariable("id") Long id){
+    public Result delete(@PathVariable("id") Long id) {
         //效验数据
         AssertUtils.isNull(id, "id");
 
@@ -101,7 +102,22 @@ public class SysDeptController {
 
     @GetMapping("listGridId/{pid}")
     @ApiOperation("获取所有下属网格ID集合")
-    public Result<List<Long>> listGridIdByPid(@PathVariable("pid") Long pid){
+    public Result<List<Long>> listGridIdByPid(@PathVariable("pid") Long pid) {
         return sysDeptService.listGridIdByPid(pid);
     }
+
+    /**
+     * 通过网格ID获取该网格所有上级机构
+     *
+     * @param gridId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @author yujintao
+     * @date 2019/9/7 09:12
+     */
+    @GetMapping("getCompleteDept/{gridId}")
+    public Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") Long gridId) {
+        return sysDeptService.getCompleteDept(gridId);
+    }
+
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -8,6 +8,7 @@
 
 package com.elink.esua.epdc.dao;
 
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
@@ -37,7 +38,8 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
 
     /**
      * 根据部门ID，获取所有子部门ID列表
-     * @param id   部门ID
+     *
+     * @param id 部门ID
      */
     List<Long> getSubDeptIdList(String id);
 
@@ -60,4 +62,14 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @date 2019/9/5 13:46
      */
     List<Long> listGridIdByPid(@Param("pid") Long pid);
+
+    /**
+     * 通过网格ID获取该网格所有上级机构
+     *
+     * @param gridId
+     * @return com.elink.esua.epdc.dto.CompleteDeptDTO
+     * @author yujintao
+     * @date 2019/9/7 09:20
+     */
+    CompleteDeptDTO getCompleteDept(@Param("gridId") Long gridId);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java

@@ -10,6 +10,7 @@ package com.elink.esua.epdc.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
 import lombok.Data;
@@ -48,6 +49,7 @@ public class SysDeptEntity extends BaseEntity {
     /**
      * 删除标识  0：未删除    1：删除
      */
+    @TableLogic
     @TableField(fill = FieldFill.INSERT)
     private Integer delFlag;
     /**

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -9,11 +9,11 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.dto.SysDeptDTO;
-import com.elink.esua.epdc.entity.SysDeptEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -62,4 +62,14 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @date 2019/9/5 13:45
      */
     Result<List<Long>> listGridIdByPid(Long pid);
+
+    /**
+     * 通过网格ID获取该网格所有上级机构
+     *
+     * @param gridId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @author yujintao
+     * @date 2019/9/7 09:13
+     */
+    Result<CompleteDeptDTO> getCompleteDept(Long gridId);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.dao.SysDeptDao;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
@@ -65,7 +66,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public List<SysSimpleDeptDTO> subList(String pid) {
         QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("pid", pid)
+        wrapper.eq("PID", pid)
+                .ne("TYPE_KEY","district_dept")
                 .select(FieldConstant.ID, FieldConstant.NAME)
                 .orderByAsc(FieldConstant.NAME);
         List<SysDeptEntity> entities = this.baseDao.selectList(wrapper);
@@ -181,4 +183,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         List<Long> deptIdList = this.baseDao.listGridIdByPid(pid);
         return new Result().ok(deptIdList);
     }
+
+    @Override
+    public Result<CompleteDeptDTO> getCompleteDept(Long gridId) {
+        CompleteDeptDTO completeDept = this.baseDao.getCompleteDept(gridId);
+        return new Result().ok(completeDept);
+    }
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -45,5 +45,25 @@
             AND NOT EXISTS
             ( SELECT 1 FROM sys_dept dd WHERE dd.pid = d.id )
     </select>
+    <select id="getCompleteDept" resultType="com.elink.esua.epdc.dto.CompleteDeptDTO">
+        SELECT
+            dis.`name` district,
+            dis.id districtId,
+            str.`name` street,
+            str.id streetId,
+            com.`name` community,
+            com.id communityId,
+            gri.`name` grid,
+            gri.id gridId
+        FROM
+            sys_dept gri
+            LEFT JOIN sys_dept com ON gri.pid = com.id
+            LEFT JOIN sys_dept str ON com.pid = str.id
+            LEFT JOIN sys_dept dis ON str.pid = dis.id
+        WHERE
+            gri.ID = #{gridId}
+            AND gri.del_flag = '0'
+            AND dis.id IS NOT NULL
+    </select>
 
 </mapper>

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsDTO.java

@@ -58,10 +58,6 @@ public class NewsDTO implements Serializable {
      */
 	private String newsProperty;
 
-    /**
-     * 新闻位置ID
-     */
-	private String newsPositionId;
 
     /**
      * 新闻主图

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java

@@ -60,7 +60,15 @@ public class NewsController {
         NewsDTO data = newsService.get(id);
         return new Result<NewsDTO>().ok(data);
     }
-
+    /***
+     * @Description   存草稿
+     * @Author  qushutong
+     * @Date   2019/9/6 16:23
+     * @Param  [dto]
+     * @Return      com.elink.esua.epdc.commons.tools.utils.Result
+     * @Exception
+     *
+     */
     @PostMapping
     public Result save(@RequestBody NewsDTO dto){
         //效验数据
@@ -93,8 +101,11 @@ public class NewsController {
 
     @PostMapping("modifyOnLine")
     public Result modifyOnLine(@RequestBody Map<String,String> parmas){
-        newsService.modifyOnLine(parmas);
+        boolean b = newsService.modifyOnLine(parmas);
-        return new Result();
+        if(b){
+            return new Result();
+        }
+        return new Result().error("下线失败 请刷新界面");
     }
 
     /**
@@ -109,5 +120,19 @@ public class NewsController {
         newsService.savePublishNews(dto);
         return new Result();
     }
+    /***
+     * @Description   草稿箱发布
+     * @Author  qushutong
+     * @Date   2019/9/6 20:35
+     * @Param  []
+     * @Return      com.elink.esua.epdc.commons.tools.utils.Result
+     * @Exception
+     *
+     */
+    @PostMapping("draftsPublishNews/{id}")
+    public  Result draftsPublishNews(@PathVariable String id){
+        newsService.modifyDraftsPublic(id);
+        return new Result();
+    }
 
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NewsEntity.java

@@ -59,10 +59,6 @@ public class NewsEntity extends BaseEpdcEntity {
      */
 	private String newsProperty;
 
-    /**
-     * 新闻位置ID
-     */
-	private String newsPositionId;
 
     /**
      * 新闻主图

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NewsExcel.java

@@ -46,8 +46,6 @@ public class NewsExcel {
     @Excel(name = "新闻属性")
     private String newsProperty;
 
-    @Excel(name = "新闻位置ID")
-    private String newsPositionId;
 
     @Excel(name = "新闻主图")
     private String newsImageUrl;

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java

@@ -101,10 +101,20 @@ public interface NewsService extends BaseService<NewsEntity> {
 
 
     /**
-     * 上线下线
+     * 下线
      */
-    void modifyOnLine(Map<String,String> parmas);
+    boolean modifyOnLine(Map<String,String> parmas);
 
     void savePublishNews(NewsDTO newsDTO);
+    /***
+     * @Description 草稿箱 发布
+     * @Author  qushutong
+     * @Date   2019/9/6 20:37
+     * @Param  [id]
+     * @Return      void
+     * @Exception
+     *
+     */
+    void  modifyDraftsPublic(String id);
 
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -42,6 +42,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -82,6 +83,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     }
 
     private QueryWrapper<NewsEntity> getWrapper(Map<String, Object> params){
+        String draft= (String) params.get("draft");
         String streetId=(String) params.get("streetId");
         String communityId=(String) params.get("communityId");
         String gridId=(String) params.get("gridId");
@@ -97,19 +99,16 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         wrapper.lt(StringUtils.isNotBlank(endTime),"CREATED_TIME",endTime);
         wrapper.eq(StringUtils.isNotBlank(category),"NEWS_CATERORY_ID",category);
         wrapper.eq(StringUtils.isNotBlank(keyword),"NEWS_TITLE",keyword);
+        //draft 前端传上来的一个标志 有则代表是存草稿箱的 1
+        if(StringUtils.isNotEmpty(draft)){
+            wrapper.eq(StringUtils.isNotBlank(draft),"NEWS_RELEASE_STATE","1");
+        }else {
+            wrapper.eq(StringUtils.isNotBlank(draft),"NEWS_RELEASE_STATE","0");
+        }
         wrapper.orderByDesc("CREATED_TIME");
         return wrapper;
     }
 
-    /**
-    * @Description
-    * @Author  qushutong
-    * @Date   2019/9/6 14:14
-    * @Param
-    * @Return
-    * @Exception
-    *
-    */
     @Override
     public NewsDTO get(String id) {
         NewsEntity entity = baseDao.selectById(id);
@@ -120,6 +119,14 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     @Transactional(rollbackFor = Exception.class)
     public void save(NewsDTO dto) {
         NewsEntity entity = ConvertUtils.sourceToTarget(dto, NewsEntity.class);
+        //默认是0  手动下线是1
+        entity.setNewsUpDownState("0");
+        UserDetail user = SecurityUser.getUser();
+        entity.setCreatorName(user.getRealName());
+        entity.setDeptId(user.getDeptId());
+        entity.setDeptName(user.getDeptName());
+        //存草稿
+        entity.setNewsReleaseState("1");
         insert(entity);
     }
 
@@ -135,6 +142,8 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     public void delete(String[] ids) {
         // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
+        //删除部门关系表相关数据
+        newsDepartmentService.deleteByNewsId(ids[0]);
     }
 
     @Override
@@ -144,25 +153,38 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     }
 
     @Override
-    public void modifyOnLine(Map<String,String> parmas) {
+    public boolean modifyOnLine(Map<String,String> parmas) {
         String id=parmas.get("id");
         String onLineState=parmas.get("onLineState");
         NewsDTO newsDTO = get(id);
-        newsDTO.setNewsUpDownState(onLineState);
+        //判断下是不是上线 是的话才执行
-        NewsEntity entity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
+        if("1".equals(newsDTO.getNewsUpDownState())){
-        updateById(entity);
+            newsDTO.setNewsUpDownState(onLineState);
+            NewsEntity entity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
+            updateById(entity);
+            return true;
+        }
+        return false;
     }
 
 
     @Override
     public void savePublishNews(NewsDTO newsDTO) {
+
+
+        publishNews(newsDTO,"0");
+    }
+
+    private void publishNews(NewsDTO newsDTO,String newsReleaseState ) {
         NewsEntity entity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
-        entity.setNewsUpDownState("1");
+        //发布的时候 默认是0  手动下线 为1
+        entity.setNewsUpDownState("0");
         UserDetail user = SecurityUser.getUser();
         entity.setCreatorName(user.getRealName());
         entity.setDeptId(user.getDeptId());
         entity.setDeptName(user.getDeptName());
-        entity.setNewsUpDownState("1");
+        //不是草稿箱
+        entity.setNewsReleaseState("0");
 
         // 通知所属部门id
         Long newsDeptId = entity.getStreetId();
@@ -202,4 +224,11 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         this.newsDepartmentService.save(entity.getId(), newsGridList);
     }
 
+    @Override
+    public void modifyDraftsPublic(String id) {
+        NewsDTO newsDTO = get(id);
+        publishNews(newsDTO,"1");
+
+    }
+
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml

@@ -9,7 +9,6 @@
         <result property="newsContent" column="NEWS_CONTENT"/>
         <result property="newsCateroryId" column="NEWS_CATERORY_ID"/>
         <result property="newsProperty" column="NEWS_PROPERTY"/>
-        <result property="newsPositionId" column="NEWS_POSITION_ID"/>
         <result property="newsImageUrl" column="NEWS_IMAGE_URL"/>
         <result property="newsUpDownState" column="NEWS_UP_DOWN_STATE"/>
         <result property="newsReleaseStartTime" column="NEWS_RELEASE_START_TIME"/>